From f8b4128c275c7c5a7cf77cb315becd228d70f136 Mon Sep 17 00:00:00 2001
From: Thom Gerdes <tgerdes@riverbed.com>
Date: Wed, 19 Apr 2017 17:26:38 +0000
Subject: [PATCH] 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.
---
 glance/files/mitaka/glance-api.conf.Debian | 2 +-
 glance/files/newton/glance-api.conf.Debian | 2 +-
 glance/files/ocata/glance-api.conf.Debian  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/glance/files/mitaka/glance-api.conf.Debian b/glance/files/mitaka/glance-api.conf.Debian
index 3efb9dc..27f0feb 100644
--- 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
index de83148..0caff81 100644
--- 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
index 8b3f40d..28c06c7 100644
--- 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 %}