diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 6421b1915f0ea34276a6afc2a8e0a0fcb2b3e0cc..c450688329d627e74aec1d37c02f59684984b7c1 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 104e02a9983919a7be17e793a75b53f66ce1b174..1f190866cbbe68ce1b8445c1ed94c87cf2e1738c 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 '' }}"