openstack
/
openstack-ansible-ops
Code Issues Proposed changes

Merge "MNAIO ELK Fixes"

This commit is contained in:
Zuul 2018-10-17 07:40:22 +00:00 committed by Gerrit Code Review
parent 0021542700 07e54ad7ee
commit 06fca4a2f6
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
multi-node-aio/playbooks/osa/user_mnaio_variables.yml
View File

@ -45,8 +45,12 @@ glance_glance_api_conf_overrides:
galera_innodb_buffer_pool_size: 1024M
galera_gcache_size: 128M
# NOTE(d34dh0r53): The disk detection to determine the logstash_queue_type
# can fail spectacularly on an MNAIO so I'm hard setting it here to bypass
# the detection code.
{% if osa_enable_elk_metrics | bool %}
{% raw %}
logstash_queue_type: memory
haproxy_extra_services:
- service:
haproxy_service_name: elastic-logstash

5
multi-node-aio/playbooks/pxe/acng.conf.j2
View File

@ -31,4 +31,7 @@ VfilePatternEx: ^/\?release=[0-9]+&arch=
# that causes more intermittent 503 errors. This DontCache line
# tells apt-cacher-ng to allow requests for these to pass through
# without being cached.
DontCache: (mirrorlist\.centos\.org)|(mariadb\.org.*\.bz2$)
# NOTE(d34dh0r53): The elastic.co repositories don't play nice with
# ACNG so we bypass caching. The relative download size is small so
# it's not a huge impact.
DontCache: (mirrorlist\.centos\.org)|(mariadb\.org.*\.bz2$)|(artifacts\.elastic\.co)