From ab3151d8f2129c719881388d4a3cfe66e85079b3 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Thu, 13 Feb 2020 15:32:39 +0100
Subject: [PATCH] Fix swift entries in group_vars/globals.yml
Change-Id: I41c2fb7d476d553aeaca34feef1d045967c284fb
---
ansible/group_vars/all.yml | 1 -
etc/kolla/globals.yml | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 6421b1915f..c450688329 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -833,7 +833,6 @@ panko_database_type: "mysql"
# Gnocchi options
#################
# 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 %}"
# Valid options are [redis, '']
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 104e02a998..1f190866cb 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -446,8 +446,8 @@
#################
# Gnocchi options
#################
-# Valid options are [ file, ceph ]
-#gnocchi_backend_storage: "file"
+# Valid options are [ file, ceph, swift ]
+#gnocchi_backend_storage: "{% if enable_swift | bool %}swift{% else %}file{% endif %}"
# Valid options are [redis, '']
#gnocchi_incoming_storage: "{{ 'redis' if enable_redis | bool else '' }}"