Merge "Managing filesystem_store_metadata_file variable"
diff --git a/glance/files/juno/glance-api.conf.Debian b/glance/files/juno/glance-api.conf.Debian
index f8e6c2c..4254065 100644
--- a/glance/files/juno/glance-api.conf.Debian
+++ b/glance/files/juno/glance-api.conf.Debian
@@ -262,7 +262,9 @@
# system. When show_multiple_locations is True the information in this
# file will be returned with any location that is contained in this
# store.
-#filesystem_store_metadata_file = None
+{%- if server.filesystem_store_metadata_file is defined %}
+filesystem_store_metadata_file = {{ server.get('filesystem_store_metadata_file', '/etc/glance/filesystem_store_metadata.json') }}
+{%- endif %}
# ============ Swift Store Options =============================
@@ -518,7 +520,9 @@
# system. When show_multiple_locations is True the information in this
# file will be returned with any location that is contained in this
# store.
-#filesystem_store_metadata_file = None
+{%- if server.filesystem_store_metadata_file is defined %}
+filesystem_store_metadata_file = {{ server.get('filesystem_store_metadata_file', '/etc/glance/filesystem_store_metadata.json') }}
+{%- endif %}
# ============ Swift Store Options =============================
diff --git a/glance/files/kilo/glance-api.conf.Debian b/glance/files/kilo/glance-api.conf.Debian
index e4f76d1..67a6b7e 100644
--- a/glance/files/kilo/glance-api.conf.Debian
+++ b/glance/files/kilo/glance-api.conf.Debian
@@ -610,7 +610,9 @@
# system. When show_multiple_locations is True the information in this
# file will be returned with any location that is contained in this
# store.
-#filesystem_store_metadata_file = None
+{%- if server.filesystem_store_metadata_file is defined %}
+filesystem_store_metadata_file = {{ server.get('filesystem_store_metadata_file', '/etc/glance/filesystem_store_metadata.json') }}
+{%- endif %}
# ============ Swift Store Options =============================
diff --git a/glance/files/liberty/glance-api.conf.Debian b/glance/files/liberty/glance-api.conf.Debian
index e29bce7..1b432ca 100644
--- a/glance/files/liberty/glance-api.conf.Debian
+++ b/glance/files/liberty/glance-api.conf.Debian
@@ -619,7 +619,9 @@
# system. When show_multiple_locations is True the information in this
# file will be returned with any location that is contained in this
# store.
-#filesystem_store_metadata_file = None
+{%- if server.filesystem_store_metadata_file is defined %}
+filesystem_store_metadata_file = {{ server.get('filesystem_store_metadata_file', '/etc/glance/filesystem_store_metadata.json') }}
+{%- endif %}
# ============ Swift Store Options =============================
diff --git a/glance/files/mitaka/glance-api.conf.Debian b/glance/files/mitaka/glance-api.conf.Debian
index b57b330..b4f1b69 100644
--- a/glance/files/mitaka/glance-api.conf.Debian
+++ b/glance/files/mitaka/glance-api.conf.Debian
@@ -1161,7 +1161,9 @@
# valid JSON object. The object should contain the keys 'id' and
# 'mountpoint'. The value for both keys should be 'string'. (string
# value)
-#filesystem_store_metadata_file = <None>
+{%- if server.filesystem_store_metadata_file is defined %}
+filesystem_store_metadata_file = {{ server.get('filesystem_store_metadata_file', '/etc/glance/filesystem_store_metadata.json') }}
+{%- endif %}
# The required permission for created image file. In this way the user
# other service used, e.g. Nova, who consumes the image could be the
diff --git a/glance/files/mitaka/glance-registry.conf.Debian b/glance/files/mitaka/glance-registry.conf.Debian
index a32a399..d1684e9 100644
--- a/glance/files/mitaka/glance-registry.conf.Debian
+++ b/glance/files/mitaka/glance-registry.conf.Debian
@@ -793,7 +793,9 @@
# valid JSON object. The object should contain the keys 'id' and
# 'mountpoint'. The value for both keys should be 'string'. (string
# value)
-#filesystem_store_metadata_file = <None>
+{%- if server.filesystem_store_metadata_file is defined %}
+filesystem_store_metadata_file = {{ server.get('filesystem_store_metadata_file', '/etc/glance/filesystem_store_metadata.json') }}
+{%- endif %}
# The required permission for created image file. In this way the user
# other service used, e.g. Nova, who consumes the image could be the
diff --git a/glance/files/newton/glance-api.conf.Debian b/glance/files/newton/glance-api.conf.Debian
index dfa014e..90f6117 100644
--- a/glance/files/newton/glance-api.conf.Debian
+++ b/glance/files/newton/glance-api.conf.Debian
@@ -2326,7 +2326,9 @@
# * None
#
# (string value)
-#filesystem_store_metadata_file = <None>
+{%- if server.filesystem_store_metadata_file is defined %}
+filesystem_store_metadata_file = {{ server.get('filesystem_store_metadata_file', '/etc/glance/filesystem_store_metadata.json') }}
+{%- endif %}
#
# File access permissions for the image files.
diff --git a/glance/files/newton/glance-cache.conf.Debian b/glance/files/newton/glance-cache.conf.Debian
index 2cad804..ac13f7a 100644
--- a/glance/files/newton/glance-cache.conf.Debian
+++ b/glance/files/newton/glance-cache.conf.Debian
@@ -1371,7 +1371,9 @@
# * None
#
# (string value)
-#filesystem_store_metadata_file = <None>
+{%- if server.filesystem_store_metadata_file is defined %}
+filesystem_store_metadata_file = {{ server.get('filesystem_store_metadata_file', '/etc/glance/filesystem_store_metadata.json') }}
+{%- endif %}
#
# File access permissions for the image files.
diff --git a/glance/files/newton/glance-glare.conf.Debian b/glance/files/newton/glance-glare.conf.Debian
index f4b9931..3936c0b 100644
--- a/glance/files/newton/glance-glare.conf.Debian
+++ b/glance/files/newton/glance-glare.conf.Debian
@@ -1090,7 +1090,9 @@
# * None
#
# (string value)
-#filesystem_store_metadata_file = <None>
+{%- if server.filesystem_store_metadata_file is defined %}
+filesystem_store_metadata_file = {{ server.get('filesystem_store_metadata_file', '/etc/glance/filesystem_store_metadata.json') }}
+{%- endif %}
#
# File access permissions for the image files.
diff --git a/glance/files/newton/glance-scrubber.conf.Debian b/glance/files/newton/glance-scrubber.conf.Debian
index 78d64cd..8d4d5c1 100644
--- a/glance/files/newton/glance-scrubber.conf.Debian
+++ b/glance/files/newton/glance-scrubber.conf.Debian
@@ -1515,7 +1515,9 @@
# * None
#
# (string value)
-#filesystem_store_metadata_file = <None>
+{%- if server.filesystem_store_metadata_file is defined %}
+filesystem_store_metadata_file = {{ server.get('filesystem_store_metadata_file', '/etc/glance/filesystem_store_metadata.json') }}
+{%- endif %}
#
# File access permissions for the image files.
diff --git a/glance/files/ocata/glance-api.conf.Debian b/glance/files/ocata/glance-api.conf.Debian
index 48501e2..7ae7ded 100644
--- a/glance/files/ocata/glance-api.conf.Debian
+++ b/glance/files/ocata/glance-api.conf.Debian
@@ -2392,7 +2392,9 @@
# * None
#
# (string value)
-#filesystem_store_metadata_file = <None>
+{%- if server.filesystem_store_metadata_file is defined %}
+filesystem_store_metadata_file = {{ server.get('filesystem_store_metadata_file', '/etc/glance/filesystem_store_metadata.json') }}
+{%- endif %}
#
# File access permissions for the image files.
diff --git a/glance/files/ocata/glance-cache.conf.Debian b/glance/files/ocata/glance-cache.conf.Debian
index 2cad804..ac13f7a 100644
--- a/glance/files/ocata/glance-cache.conf.Debian
+++ b/glance/files/ocata/glance-cache.conf.Debian
@@ -1371,7 +1371,9 @@
# * None
#
# (string value)
-#filesystem_store_metadata_file = <None>
+{%- if server.filesystem_store_metadata_file is defined %}
+filesystem_store_metadata_file = {{ server.get('filesystem_store_metadata_file', '/etc/glance/filesystem_store_metadata.json') }}
+{%- endif %}
#
# File access permissions for the image files.
diff --git a/glance/files/ocata/glance-glare.conf.Debian b/glance/files/ocata/glance-glare.conf.Debian
index f4b9931..3936c0b 100644
--- a/glance/files/ocata/glance-glare.conf.Debian
+++ b/glance/files/ocata/glance-glare.conf.Debian
@@ -1090,7 +1090,9 @@
# * None
#
# (string value)
-#filesystem_store_metadata_file = <None>
+{%- if server.filesystem_store_metadata_file is defined %}
+filesystem_store_metadata_file = {{ server.get('filesystem_store_metadata_file', '/etc/glance/filesystem_store_metadata.json') }}
+{%- endif %}
#
# File access permissions for the image files.
diff --git a/glance/files/ocata/glance-scrubber.conf.Debian b/glance/files/ocata/glance-scrubber.conf.Debian
index 78d64cd..8d4d5c1 100644
--- a/glance/files/ocata/glance-scrubber.conf.Debian
+++ b/glance/files/ocata/glance-scrubber.conf.Debian
@@ -1515,7 +1515,9 @@
# * None
#
# (string value)
-#filesystem_store_metadata_file = <None>
+{%- if server.filesystem_store_metadata_file is defined %}
+filesystem_store_metadata_file = {{ server.get('filesystem_store_metadata_file', '/etc/glance/filesystem_store_metadata.json') }}
+{%- endif %}
#
# File access permissions for the image files.