Merge "Refactor memcached_servers"

defaults/main.yml

@@ -257,6 +257,9 @@ keystone_external_ssl: false
 # External SSL forwarding proto
 keystone_secure_proxy_ssl_header: HTTP_X_FORWARDED_PROTO
 
+## Override memcached_servers
+keystone_memcached_servers: "{{ memcached_servers }}"
+
 ## Caching
 # This is a list of strings, each string contains a cache server's
 # information (IP:port for example)

tasks/keystone_idp_self_signed_distribute.yml

@@ -20,7 +20,7 @@
     state: "retrieve"
     file_mode: "{{ item.file_mode }}"
     dir_mode: "{{ item.dir_mode }}"
-    server: "{{ memcached_servers }}"
+    server: "{{ keystone_memcached_servers }}"
     encrypt_string: "{{ memcached_encryption_key }}"
   with_items:
     - { src: "{{ keystone_idp.certfile }}", name: "keystone_idp_cert", file_mode: "0640", dir_mode: "0750" }

tasks/keystone_idp_self_signed_store.yml

@@ -18,7 +18,7 @@
     name: "{{ item.name }}"
     file_path: "{{ item.src }}"
     state: "present"
-    server: "{{ memcached_servers }}"
+    server: "{{ keystone_memcached_servers }}"
     encrypt_string: "{{ memcached_encryption_key }}"
   with_items:
     - { src: "{{ keystone_idp.certfile }}", name: "keystone_idp_cert" }

templates/shibboleth2.xml.j2

@@ -13,13 +13,13 @@
 
     <StorageService type="MEMCACHE" id="mc" prefix="shibboleth2:">
         <Hosts>
-            {{ memcached_servers }}
+            {{ keystone_memcached_servers }}
         </Hosts>
     </StorageService>
 
     <StorageService type="MEMCACHE" id="mc-ctx" prefix="shibboleth2:" buildMap="1">
         <Hosts>
-            {{ memcached_servers }}
+            {{ keystone_memcached_servers }}
         </Hosts>
     </StorageService>