diff --git a/hooks/nova_cc_context.py b/hooks/nova_cc_context.py index 19a35320..d61bf273 100644 --- a/hooks/nova_cc_context.py +++ b/hooks/nova_cc_context.py @@ -321,5 +321,6 @@ class InstanceConsoleContext(context.OSContextGenerator): level='WARNING') servers = [] - ctxt['memcached_servers'] = servers + ctxt['memcached_servers'] = ','.join( + ["%s:%s" % (s['private-address'], s['port']) for s in servers]) return ctxt diff --git a/templates/grizzly/nova.conf b/templates/grizzly/nova.conf index e67c32fc..4921d893 100644 --- a/templates/grizzly/nova.conf +++ b/templates/grizzly/nova.conf @@ -22,7 +22,7 @@ auth_strategy=keystone compute_driver=libvirt.LibvirtDriver {% if memcached_servers %} -memcached_servers = {%for s in memcached_servers %}{% if loop.index0 != 0 %},{% endif %}{{s['private-address']}}:{{s['port']}}{% endfor %} +memcached_servers = {{ memcached_servers }} {% endif %} {% if keystone_ec2_url -%} diff --git a/templates/havana/nova.conf b/templates/havana/nova.conf index 7cbf0ef0..77b88110 100644 --- a/templates/havana/nova.conf +++ b/templates/havana/nova.conf @@ -28,7 +28,7 @@ use_syslog={{ use_syslog }} my_ip = {{ host_ip }} {% if memcached_servers %} -memcached_servers = {%for s in memcached_servers %}{% if loop.index0 != 0 %},{% endif %}{{s['private-address']}}:{{s['port']}}{% endfor %} +memcached_servers = {{ memcached_servers }} {% endif %} {% if keystone_ec2_url -%} diff --git a/templates/icehouse/nova.conf b/templates/icehouse/nova.conf index 3e0d0883..67385124 100644 --- a/templates/icehouse/nova.conf +++ b/templates/icehouse/nova.conf @@ -39,7 +39,7 @@ use_syslog={{ use_syslog }} my_ip = {{ host_ip }} {% if memcached_servers %} -memcached_servers = {%for s in memcached_servers %}{% if loop.index0 != 0 %},{% endif %}{{s['private-address']}}:{{s['port']}}{% endfor %} +memcached_servers = {{ memcached_servers }} {% endif %} {% if keystone_ec2_url -%} diff --git a/unit_tests/test_nova_cc_contexts.py b/unit_tests/test_nova_cc_contexts.py index 33ea3d44..76486f34 100644 --- a/unit_tests/test_nova_cc_contexts.py +++ b/unit_tests/test_nova_cc_contexts.py @@ -55,7 +55,7 @@ class NovaComputeContextTests(CharmTestCase): self.related_units.return_value = 'memcached/0' instance_console = context.InstanceConsoleContext() os_release.return_value = 'icehouse' - self.assertEqual({'memcached_servers': []}, + self.assertEqual({'memcached_servers': ''}, instance_console()) @mock.patch.object(utils, 'os_release') @@ -83,5 +83,5 @@ class NovaComputeContextTests(CharmTestCase): instance_console = context.InstanceConsoleContext() os_release.return_value = 'icehouse' self.maxDiff = None - self.assertEqual({'memcached_servers': memcached_servers}, + self.assertEqual({'memcached_servers': "%s:11211" % (formated_ip, )}, instance_console())