Checking cache.members is defined or not
Related-PROD: PROD-24452
Change-Id: I035af1058e5166c184996d6537ba15c669e9b806
diff --git a/glance/files/mitaka/glance-api.conf.Debian b/glance/files/mitaka/glance-api.conf.Debian
index 500b139..2864776 100644
--- a/glance/files/mitaka/glance-api.conf.Debian
+++ b/glance/files/mitaka/glance-api.conf.Debian
@@ -1273,7 +1273,7 @@
auth_uri=http://{{ server.identity.host }}:5000
auth_url=http://{{ server.identity.host }}:35357
-{%- if server.cache is defined %}
+{%- if server.get('cache',{}).members is defined %}
memcached_servers={%- for member in server.cache.members %}{{ member.host }}:11211{% if not loop.last %},{% endif %}{%- endfor %}
{%- endif %}
diff --git a/glance/files/mitaka/glance-registry.conf.Debian b/glance/files/mitaka/glance-registry.conf.Debian
index 9c25d94..6ce82be 100644
--- a/glance/files/mitaka/glance-registry.conf.Debian
+++ b/glance/files/mitaka/glance-registry.conf.Debian
@@ -864,7 +864,7 @@
auth_uri=http://{{ server.identity.host }}:5000
auth_url=http://{{ server.identity.host }}:35357
-{%- if server.cache is defined %}
+{%- if server.get('cache',{}).members is defined %}
memcached_servers={%- for member in server.cache.members %}{{ member.host }}:11211{% if not loop.last %},{% endif %}{%- endfor %}
{%- endif %}
#
diff --git a/glance/files/newton/glance-api.conf.Debian b/glance/files/newton/glance-api.conf.Debian
index 3aa8ac0..b05b12a 100644
--- a/glance/files/newton/glance-api.conf.Debian
+++ b/glance/files/newton/glance-api.conf.Debian
@@ -3358,7 +3358,7 @@
auth_url=http://{{ server.identity.host }}:35357
token_cache_time = -1
-{%- if server.cache is defined %}
+{%- if server.get('cache',{}).members is defined %}
memcached_servers={%- for member in server.cache.members %}{{ member.host }}:11211{% if not loop.last %},{% endif %}{%- endfor %}
{%- endif %}
#
diff --git a/glance/files/newton/glance-glare.conf.Debian b/glance/files/newton/glance-glare.conf.Debian
index fa9bf02..5c07e27 100644
--- a/glance/files/newton/glance-glare.conf.Debian
+++ b/glance/files/newton/glance-glare.conf.Debian
@@ -2057,7 +2057,7 @@
auth_url=http://{{ server.identity.host }}:35357
token_cache_time = -1
-{%- if server.cache is defined %}
+{%- if server.get('cache',{}).members is defined %}
memcached_servers={%- for member in server.cache.members %}{{ member.host }}:11211{% if not loop.last %},{% endif %}{%- endfor %}
{%- endif %}
#
diff --git a/glance/files/newton/glance-registry.conf.Debian b/glance/files/newton/glance-registry.conf.Debian
index 29cad6a..c0f0f31 100644
--- a/glance/files/newton/glance-registry.conf.Debian
+++ b/glance/files/newton/glance-registry.conf.Debian
@@ -1185,7 +1185,7 @@
auth_uri=http://{{ server.identity.host }}:5000
auth_url=http://{{ server.identity.host }}:35357
-{%- if server.cache is defined %}
+{%- if server.get('cache',{}).members is defined %}
memcached_servers={%- for member in server.cache.members %}{{ member.host }}:11211{% if not loop.last %},{% endif %}{%- endfor %}
{%- endif %}
# Complete "public" Identity API endpoint. This endpoint should not be an
diff --git a/glance/files/ocata/glance-api.conf.Debian b/glance/files/ocata/glance-api.conf.Debian
index 978030b..0df2de0 100644
--- a/glance/files/ocata/glance-api.conf.Debian
+++ b/glance/files/ocata/glance-api.conf.Debian
@@ -3434,7 +3434,7 @@
token_cache_time = -1
-{%- if server.cache is defined %}
+{%- if server.get('cache',{}).members is defined %}
memcached_servers={%- for member in server.cache.members %}{{ member.host }}:11211{% if not loop.last %},{% endif %}{%- endfor %}
{%- endif %}
#
diff --git a/glance/files/ocata/glance-glare.conf.Debian b/glance/files/ocata/glance-glare.conf.Debian
index 9a43951..e7c503d 100644
--- a/glance/files/ocata/glance-glare.conf.Debian
+++ b/glance/files/ocata/glance-glare.conf.Debian
@@ -2062,7 +2062,7 @@
{%- endif %}
token_cache_time = -1
-{%- if server.cache is defined %}
+{%- if server.get('cache',{}).members is defined %}
memcached_servers={%- for member in server.cache.members %}{{ member.host }}:11211{% if not loop.last %},{% endif %}{%- endfor %}
{%- endif %}
#
diff --git a/glance/files/ocata/glance-registry.conf.Debian b/glance/files/ocata/glance-registry.conf.Debian
index 9693894..889bb93 100644
--- a/glance/files/ocata/glance-registry.conf.Debian
+++ b/glance/files/ocata/glance-registry.conf.Debian
@@ -1189,7 +1189,7 @@
cafile={{ server.identity.get('cacert_file', server.cacert_file) }}
{%- endif %}
-{%- if server.cache is defined %}
+{%- if server.get('cache',{}).members is defined %}
memcached_servers={%- for member in server.cache.members %}{{ member.host }}:11211{% if not loop.last %},{% endif %}{%- endfor %}
{%- endif %}
# Complete "public" Identity API endpoint. This endpoint should not be an
diff --git a/glance/files/pike/glance-api.conf.Debian b/glance/files/pike/glance-api.conf.Debian
index 604f9d9..c295381 100644
--- a/glance/files/pike/glance-api.conf.Debian
+++ b/glance/files/pike/glance-api.conf.Debian
@@ -3274,7 +3274,9 @@
token_cache_time = -1
{%- if server.cache is defined %}
+{%- if server.cache.members is defined %}
memcached_servers={%- for member in server.cache.members %}{{ member.host }}:11211{% if not loop.last %},{% endif %}{%- endfor %}
+{%- endif %}
{%- if server.cache.get('security', {}).get('enabled', False) %}
memcache_security_strategy = {{ server.cache.security.get('strategy', 'ENCRYPT') }}
{%- if server.cache.security.secret_key is not defined or not server.cache.security.secret_key %}
diff --git a/glance/files/pike/glance-api.conf.RedHat b/glance/files/pike/glance-api.conf.RedHat
deleted file mode 100644
index 7a47331..0000000
--- a/glance/files/pike/glance-api.conf.RedHat
+++ /dev/null
@@ -1 +0,0 @@
-glance-api.conf.Debian
\ No newline at end of file
diff --git a/glance/files/pike/glance-api.conf.RedHat b/glance/files/pike/glance-api.conf.RedHat
new file mode 120000
index 0000000..7a47331
--- /dev/null
+++ b/glance/files/pike/glance-api.conf.RedHat
@@ -0,0 +1 @@
+glance-api.conf.Debian
\ No newline at end of file
diff --git a/glance/files/pike/glance-cache.conf.RedHat b/glance/files/pike/glance-cache.conf.RedHat
deleted file mode 100644
index ac4c3d1..0000000
--- a/glance/files/pike/glance-cache.conf.RedHat
+++ /dev/null
@@ -1 +0,0 @@
-glance-cache.conf.Debian
\ No newline at end of file
diff --git a/glance/files/pike/glance-cache.conf.RedHat b/glance/files/pike/glance-cache.conf.RedHat
new file mode 120000
index 0000000..ac4c3d1
--- /dev/null
+++ b/glance/files/pike/glance-cache.conf.RedHat
@@ -0,0 +1 @@
+glance-cache.conf.Debian
\ No newline at end of file
diff --git a/glance/files/pike/glance-registry.conf.Debian b/glance/files/pike/glance-registry.conf.Debian
index 45c976f..6128221 100644
--- a/glance/files/pike/glance-registry.conf.Debian
+++ b/glance/files/pike/glance-registry.conf.Debian
@@ -1196,7 +1196,9 @@
{%- endif %}
{%- if server.cache is defined %}
+{%- if server.cache.members is defined %}
memcached_servers={%- for member in server.cache.members %}{{ member.host }}:11211{% if not loop.last %},{% endif %}{%- endfor %}
+{%- endif %}
{%- if server.cache.get('security', {}).get('enabled', False) %}
memcache_security_strategy = {{ server.cache.security.get('strategy', 'ENCRYPT') }}
{%- if server.cache.security.secret_key is not defined or not server.cache.security.secret_key %}
diff --git a/glance/files/pike/glance-registry.conf.RedHat b/glance/files/pike/glance-registry.conf.RedHat
deleted file mode 100644
index a4170b8..0000000
--- a/glance/files/pike/glance-registry.conf.RedHat
+++ /dev/null
@@ -1 +0,0 @@
-glance-registry.conf.Debian
\ No newline at end of file
diff --git a/glance/files/pike/glance-registry.conf.RedHat b/glance/files/pike/glance-registry.conf.RedHat
new file mode 120000
index 0000000..a4170b8
--- /dev/null
+++ b/glance/files/pike/glance-registry.conf.RedHat
@@ -0,0 +1 @@
+glance-registry.conf.Debian
\ No newline at end of file
diff --git a/glance/files/pike/glance-scrubber.conf.RedHat b/glance/files/pike/glance-scrubber.conf.RedHat
deleted file mode 100644
index 2fc1db1..0000000
--- a/glance/files/pike/glance-scrubber.conf.RedHat
+++ /dev/null
@@ -1 +0,0 @@
-glance-scrubber.conf.Debian
\ No newline at end of file
diff --git a/glance/files/pike/glance-scrubber.conf.RedHat b/glance/files/pike/glance-scrubber.conf.RedHat
new file mode 120000
index 0000000..2fc1db1
--- /dev/null
+++ b/glance/files/pike/glance-scrubber.conf.RedHat
@@ -0,0 +1 @@
+glance-scrubber.conf.Debian
\ No newline at end of file