Update template to take subordinate config options.

This commit is contained in:
Adam Gandelman 2013-10-14 12:15:50 -07:00
parent ed71ab066c
commit df3a7d33bf
4 changed files with 10 additions and 4 deletions
hooks
charmhelpers/contrib/openstack
nova_cc_hooks.py
revision
templates/folsom

@ -491,8 +491,8 @@ class SubordinateConfigContext(OSContextGenerator):
ctxt = {}
for rid in relation_ids(self.interface):
for unit in related_units(rid):
sub_config = relation_get('subordinate_config',
relaton_id=rid, unit=unit)
sub_config = relation_get('subordinate_configuration',
rid=rid, unit=unit)
if sub_config and sub_config != '':
try:
sub_config = json.loads(sub_config)

@ -401,7 +401,7 @@ def nova_vmware_relation_joined():
relation_set(network_manager=network_manager())
@hooks.hook()
@hooks.hook('nova-vmware-relation-changed')
@restart_on_change(restart_map())
def nova_vmware_relation_changed():
CONFIGS.write('/etc/nova/nova.conf')

@ -1 +1 @@
305
306

@ -90,3 +90,9 @@ volume_api_class=nova.volume.cinder.API
{{ key }} = {{ value }}
{% endfor -%}
{% endif -%}
{% if sections and 'DEFAULT' in sections -%}
{% for key, value in sections['DEFAULT'] -%}
{{ key }} = {{ value }}
{% endfor -%}
{% endif -%}