openstack/kolla-ansible
Code Issues Proposed changes

Use redis as gnocchi incoming storage and tooz backend when enabled

Browse Source 
- redis is much faster than ceph as incoming storage
- redis tooz backend is full implemented

Change-Id: Ia0b4bc65ea11e504c82fc8a5ad8aa447bee00630
This commit is contained in:
Jeffrey Zhang 2018-01-25 15:09:22 +08:00 committed by Jeffrey Zhang
parent 5110b81b22
commit fca572506e
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/group_vars/all.yml
View File

@ -585,6 +585,9 @@ panko_database_type: "mysql"
# Valid options are [file, ceph]
gnocchi_backend_storage: "{{ 'ceph' if enable_ceph|bool else 'file' }}"
# Valid options are [redis, '']
gnocchi_incoming_storage: "{{ 'redis' if enable_redis | bool else '' }}"
#################################
# Cinder options

10
ansible/roles/gnocchi/templates/gnocchi.conf.j2
View File

@ -3,6 +3,10 @@ debug = {{ gnocchi_logging_debug }}
log_dir = /var/log/kolla/gnocchi
{% if enable_redis | bool %}
coordination_url = redis://{% for host in groups['redis'] %}{% if host == groups['redis'][0] %}admin:{{ redis_master_password }}@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ redis_sentinel_port }}?sentinel=kolla{% else %}&sentinel_fallback={{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ redis_sentinel_port }}{% endif %}{% endfor %}&socket_timeout=60&retry_on_timeout=yes
{% endif %}
{% if service_name == 'gnocchi-api' %}
# Force gnocchi-api.log or will use app.wsgi
log_file = /var/log/kolla/gnocchi/gnocchi-api.log
@ -54,6 +58,12 @@ memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansi
policy_file = {{ gnocchi_policy_file }}
{% endif %}
[incoming]
{% if gnocchi_incoming_storage == 'redis' %}
driver = redis
redis_url = redis://{% for host in groups['redis'] %}{% if host == groups['redis'][0] %}admin:{{ redis_master_password }}@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ redis_sentinel_port }}?sentinel=kolla{% else %}&sentinel_fallback={{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ redis_sentinel_port }}{% endif %}{% endfor %}&db=0&socket_timeout=60&retry_on_timeout=yes
{% endif %}
[storage]
{% if gnocchi_backend_storage == 'file' %}
driver = file

2
etc/kolla/globals.yml
View File

@ -309,6 +309,8 @@ kolla_internal_vip_address: "10.10.10.254"
# Valid options are [ file, ceph ]
#gnocchi_backend_storage: "{{ 'ceph' if enable_ceph|bool else 'file' }}"
# Valid options are [redis, '']
#gnocchi_incoming_storage: "{{ 'redis' if enable_redis | bool else '' }}"
################################
# Cinder - Block Storage Options