openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix swift entries in group_vars/globals.yml"

Browse Source
This commit is contained in:
Zuul 2020-02-13 18:26:20 +00:00 committed by Gerrit Code Review
commit d8300d5ae7
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/group_vars/all.yml
View File

@ -833,7 +833,6 @@ panko_database_type: "mysql"
# Gnocchi options # Gnocchi options
################# #################
# Valid options are [ file, ceph, swift ] # Valid options are [ file, ceph, swift ]
# Defaults to file if ceph and swift are enabled; explicitly set to either if required.
gnocchi_backend_storage: "{% if enable_swift | bool %}swift{% else %}file{% endif %}" gnocchi_backend_storage: "{% if enable_swift | bool %}swift{% else %}file{% endif %}"
# Valid options are [redis, ''] # Valid options are [redis, '']

4
etc/kolla/globals.yml
View File

@ -446,8 +446,8 @@
################# #################
# Gnocchi options # Gnocchi options
################# #################
# Valid options are [ file, ceph ] # Valid options are [ file, ceph, swift ]
#gnocchi_backend_storage: "file" #gnocchi_backend_storage: "{% if enable_swift | bool %}swift{% else %}file{% endif %}"
# Valid options are [redis, ''] # Valid options are [redis, '']
#gnocchi_incoming_storage: "{{ 'redis' if enable_redis | bool else '' }}" #gnocchi_incoming_storage: "{{ 'redis' if enable_redis | bool else '' }}"