fix memcached server for keystone
Change-Id: I916b880388afa916cee28cc42492c98331ef84e1
diff --git a/README.rst b/README.rst
index c0b397e..1e9143d 100644
--- a/README.rst
+++ b/README.rst
@@ -64,7 +64,9 @@
- host: 127.0.0.1
port: 9160
cache:
- host: 127.0.0.1
+ members:
+ - host: 127.0.0.1
+ port: 11211
identity:
engine: keystone
version: '2.0'
@@ -201,7 +203,13 @@
- host: 127.0.0.1
port: 9160
cache:
- host: 127.0.0.1
+ members:
+ - host: 127.0.0.1
+ port: 11211
+ - host: 127.0.0.1
+ port: 11211
+ - host: 127.0.0.1
+ port: 11211
identity:
engine: keystone
version: '2.0'
@@ -354,7 +362,13 @@
- host: 127.0.0.1
port: 9160
cache:
- host: 127.0.0.1
+ members:
+ - host: 127.0.0.1
+ port: 11211
+ - host: 127.0.0.1
+ port: 11211
+ - host: 127.0.0.1
+ port: 11211
identity:
engine: keystone
version: '2.0'
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index 858f181..d53b59e 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -47,7 +47,13 @@
- host: ${_param:cluster_node03_address}
port: 9160
cache:
- host: ${_param:cluster_local_address}
+ members:
+ - host: ${_param:cluster_node01_address}
+ port: 11211
+ - host: ${_param:cluster_node02_address}
+ port: 11211
+ - host: ${_param:cluster_node03_address}
+ port: 11211
identity:
engine: keystone
version: '2.0'
diff --git a/metadata/service/control/control.yml b/metadata/service/control/control.yml
index df3e021..b47102b 100644
--- a/metadata/service/control/control.yml
+++ b/metadata/service/control/control.yml
@@ -47,7 +47,13 @@
- host: ${_param:cluster_node03_address}
port: 9160
cache:
- host: ${_param:cluster_local_address}
+ members:
+ - host: ${_param:cluster_node01_address}
+ port: 11211
+ - host: ${_param:cluster_node02_address}
+ port: 11211
+ - host: ${_param:cluster_node03_address}
+ port: 11211
identity:
engine: keystone
version: '2.0'
diff --git a/opencontrail/files/2.2/contrail-keystone-auth.conf b/opencontrail/files/2.2/contrail-keystone-auth.conf
index c4ca1d1..ba13b50 100644
--- a/opencontrail/files/2.2/contrail-keystone-auth.conf
+++ b/opencontrail/files/2.2/contrail-keystone-auth.conf
@@ -9,4 +9,4 @@
admin_tenant_name={{ config.identity.tenant }}
insecure=True
#memcache_servers=127.0.0.1:11211
-memcache_servers={% for member in config.members %}{{ member.host }}:11211{% if not loop.last %},{% endif %}{% endfor %}
+memcache_servers={% for member in config.cache.members %}{{ member.host }}:{{ member.port }}{% if not loop.last %},{% endif %}{% endfor %}
diff --git a/opencontrail/files/3.0/contrail-keystone-auth.conf b/opencontrail/files/3.0/contrail-keystone-auth.conf
index c4ca1d1..ba13b50 100644
--- a/opencontrail/files/3.0/contrail-keystone-auth.conf
+++ b/opencontrail/files/3.0/contrail-keystone-auth.conf
@@ -9,4 +9,4 @@
admin_tenant_name={{ config.identity.tenant }}
insecure=True
#memcache_servers=127.0.0.1:11211
-memcache_servers={% for member in config.members %}{{ member.host }}:11211{% if not loop.last %},{% endif %}{% endfor %}
+memcache_servers={% for member in config.cache.members %}{{ member.host }}:{{ member.port }}{% if not loop.last %},{% endif %}{% endfor %}
diff --git a/opencontrail/meta/sphinx.yml b/opencontrail/meta/sphinx.yml
index bb41eab..50cc1f0 100644
--- a/opencontrail/meta/sphinx.yml
+++ b/opencontrail/meta/sphinx.yml
@@ -15,9 +15,6 @@
analytics:
name: "Analytics host"
value: {{ config.analytics.host }}
- cache:
- name: "Cache host"
- value: {{ config.cache.host }}
version:
name: "Contrail version"
value: {{ config.version }}
diff --git a/tests/pillar/cluster.sls b/tests/pillar/cluster.sls
index 2f8a6e2..a1984fd 100644
--- a/tests/pillar/cluster.sls
+++ b/tests/pillar/cluster.sls
@@ -41,7 +41,13 @@
- host: 127.0.0.1
port: 9160
cache:
- host: 127.0.0.1
+ members:
+ - host: 127.0.0.1
+ port: 11211
+ - host: 127.0.0.1
+ port: 11211
+ - host: 127.0.0.1
+ port: 11211
identity:
engine: keystone
version: '2.0'
diff --git a/tests/pillar/control.sls b/tests/pillar/control.sls
index 453733f..83ec951 100644
--- a/tests/pillar/control.sls
+++ b/tests/pillar/control.sls
@@ -38,7 +38,13 @@
- host: 127.0.0.1
port: 9160
cache:
- host: 127.0.0.1
+ members:
+ - host: 127.0.0.1
+ port: 11211
+ - host: 127.0.0.1
+ port: 11211
+ - host: 127.0.0.1
+ port: 11211
identity:
engine: keystone
version: '2.0'
diff --git a/tests/pillar/single.sls b/tests/pillar/single.sls
index 51b2732..4a253f7 100644
--- a/tests/pillar/single.sls
+++ b/tests/pillar/single.sls
@@ -37,7 +37,9 @@
- host: 127.0.0.1
port: 9160
cache:
- host: 127.0.0.1
+ members:
+ - host: 127.0.0.1
+ port: 11211
identity:
engine: keystone
version: '2.0'