supply a list of memcache servers rather than the load balancer IP

addresses #373

rpc_deployment/roles/cinder_common/templates/cinder.conf

@@ -63,7 +63,8 @@ admin_tenant_name = {{ service_admin_tenant_name }}
 admin_user = {{ service_admin_username }}
 admin_password = {{ service_admin_password }}
 
-memcached_servers = {{ internal_vip_address }}:{{ memcached_port }}
+memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['container_address'] }}:{{ memcached_port|default('11211') }}{% if not loop.last %},{% endif %}{% endfor %}
+
 token_cache_time = 300
 revocation_cache_time = 60
  

rpc_deployment/roles/glance_common/templates/glance-api.conf

@@ -63,7 +63,8 @@ admin_tenant_name = {{ service_admin_tenant_name }}
 admin_user = {{ service_admin_username }}
 admin_password = {{ service_admin_password }}
 
-memcached_servers = {{ internal_vip_address }}:{{ memcached_port }}
+memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['container_address'] }}:{{ memcached_port|default('11211') }}{% if not loop.last %},{% endif %}{% endfor %}
+
 token_cache_time = 300
 revocation_cache_time = 60
 

rpc_deployment/roles/glance_common/templates/glance-registry.conf

@@ -18,7 +18,8 @@ admin_tenant_name = {{ service_admin_tenant_name }}
 admin_user = {{ service_admin_username }}
 admin_password = {{ service_admin_password }}
 
-memcached_servers = {{ internal_vip_address }}:{{ memcached_port }}
+memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['container_address'] }}:{{ memcached_port|default('11211') }}{% if not loop.last %},{% endif %}{% endfor %}
+
 token_cache_time = 300
 revocation_cache_time = 60
 

rpc_deployment/roles/heat_common/templates/heat.conf

@@ -88,7 +88,8 @@ admin_tenant_name = {{ service_admin_tenant_name }}
 admin_user = {{ service_admin_username }}
 admin_password = {{ service_admin_password }}
 
-memcached_servers = {{ internal_vip_address }}:{{ memcached_port }}
+memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['container_address'] }}:{{ memcached_port|default('11211') }}{% if not loop.last %},{% endif %}{% endfor %}
+
 token_cache_time = 300
 revocation_cache_time = 60
 

rpc_deployment/roles/horizon_common/templates/local_settings.py

@@ -103,7 +103,10 @@ SECRET_KEY = secret_key.generate_or_read_from_file(os.path.join(LOCAL_PATH, '.se
 CACHES = {
     'default': {
         'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-        'LOCATION': '{{ internal_vip_address }}:{{ memcached_port }}',
+        'LOCATION': [
+        {% for host in groups['memcached'] %}'{{ hostvars[host]['container_address'] }}:{{ memcached_port|default('11211') }}'{% if not loop.last %},{% endif %}{% endfor %}
+
+        ]
     }
 }
 

rpc_deployment/roles/keystone_common/templates/keystone.conf.j2

@@ -17,7 +17,8 @@ rabbit_password = {{ rabbit_password }}
 rpc_backend = {{ rpc_backend }}
 
 [memcache]
-servers = {{ internal_vip_address }}:{{ memcached_port }}
+servers = {% for host in groups['memcached'] %}{{ hostvars[host]['container_address'] }}:{{ memcached_port|default('11211') }}{% if not loop.last %},{% endif %}{% endfor %}
+
 max_compare_and_set_retry = 16
 
 [cache]

rpc_deployment/roles/neutron_common/templates/neutron.conf

@@ -92,7 +92,8 @@ admin_tenant_name = {{ service_admin_tenant_name }}
 admin_user = {{ service_admin_username }}
 admin_password = {{ service_admin_password }}
 
-memcached_servers = {{ internal_vip_address }}:{{ memcached_port }}
+memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['container_address'] }}:{{ memcached_port|default('11211') }}{% if not loop.last %},{% endif %}{% endfor %}
+
 token_cache_time = 300
 revocation_cache_time = 60
 

rpc_deployment/roles/nova_common/templates/nova.conf

@@ -87,7 +87,7 @@ force_config_drive = always
 max_age = {{ nova_max_age }}
 
 # Common
-memcached_servers = {{ internal_vip_address }}:{{ memcached_port }}
+memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['container_address'] }}:{{ memcached_port|default('11211') }}{% if not loop.last %},{% endif %}{% endfor %}
 
 # Cinder
 [cinder]
@@ -139,7 +139,8 @@ admin_password = {{ service_admin_password }}
 admin_user = {{ service_admin_username }}
 admin_tenant_name = {{ service_admin_tenant_name }}
 
-memcached_servers = {{ internal_vip_address }}:{{ memcached_port }}
+memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['container_address'] }}:{{ memcached_port|default('11211') }}{% if not loop.last %},{% endif %}{% endfor %}
+
 token_cache_time = 300
 revocation_cache_time = 60
 

rpc_deployment/roles/swift_proxy/templates/proxy-server.conf.j2

@@ -316,7 +316,7 @@ use = egg:swift#memcache
 # memcache.conf (see memcache.conf-sample) or lacking that file, it will
 # default to the value below. You can specify multiple servers separated with
 # commas, as in: 10.1.2.3:11211,10.1.2.4:11211
-memcache_servers = {{ internal_vip_address }}:{{ memcached_port }}
+memcache_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['container_address'] }}:{{ memcached_port|default('11211') }}{% if not loop.last %},{% endif %}{% endfor %}
 #
 # Sets how memcache values are serialized and deserialized:
 # 0 = older, insecure pickle serialization

rpc_deployment/vars/config_vars/haproxy_config.yml

@@ -147,13 +147,6 @@ haproxy_config:
       hap_backend_alg: source
       hap_backend_options:
        - "ssl-hello-chk"
-  - service:
-      hap_service_name: memcached
-      hap_backend_nodes: "{{ [groups['memcached'][0]] }}"  # list expected
-      hap_backup_nodes: "{{ groups['memcached'][1:] }}"
-      hap_port: 11211
-      hap_balance_type: tcp
-      hap_whitelist_hosts: true
   - service:
       hap_service_name: elasticsearch
       hap_backend_nodes: "{{ [groups['elasticsearch'][0]] }}"