Allow file engine to be used with other engines

A cloud should be allowed to enable file and rbd or swift backends. This check prevented other backends from being enabled if file was in the list.
salt-formulas · May 30, 2017 · 135767c · 135767c
1 parent 3db6b76
commit 135767c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/glance/files/mitaka/glance-api.conf.Debian b/glance/files/mitaka/glance-api.conf.Debian
@@ -792,7 +792,7 @@ max_overflow = 30
 # List of stores enabled. Valid stores are: cinder, file, http, rbd,
 # sheepdog, swift, s3, vsphere (list value)
 #stores = file,http
-{%- if 'file' in storage_engines %}
+{%- if ['file'] == storage_engines %}
 default_store = file
 stores = file,http
 {%- else %}

diff --git a/glance/files/newton/glance-api.conf.Debian b/glance/files/newton/glance-api.conf.Debian
@@ -1929,7 +1929,7 @@ max_overflow = 30
 #
 #  (list value)
 #stores = file,http
-{%- if 'file' in storage_engines %}
+{%- if ['file'] == storage_engines %}
 default_store = file
 stores = file,http
 {%- else %}

diff --git a/glance/files/ocata/glance-api.conf.Debian b/glance/files/ocata/glance-api.conf.Debian
@@ -1995,7 +1995,7 @@ max_overflow = 30
 #
 #  (list value)
 #stores = file,http
-{%- if 'file' in storage_engines %}
+{%- if ['file'] == storage_engines %}
 default_store = file
 stores = file,http
 {%- else %}