openstack
/
charm-nova-cloud-controller
Code Issues Proposed changes

Refactor the way memcached_servers config is put in the templates 

Instead of formatting the string with Jinja2, it's formatted with python
and passed to the template as a string.
This commit is contained in:
Felipe Reyes 2014-12-16 11:08:58 -03:00
parent fd40c349b2
commit ec00658edf
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hooks/nova_cc_context.py
View File

@ -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

2
templates/grizzly/nova.conf
View File

@ -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 -%}

2
templates/havana/nova.conf
View File

@ -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 -%}

2
templates/icehouse/nova.conf
View File

@ -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 -%}

4
unit_tests/test_nova_cc_contexts.py
View File

@ -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())