openstack
/
charm-neutron-api
Code Issues Proposed changes

Allow subordinate to add comments and fix placement of restart_on_change decorator so it actually works

This commit is contained in:
Liam Young 2014-06-10 12:09:12 +00:00
parent 0fb51e524a
commit a51eccd50d
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/neutron_api_hooks.py
View File

@ -242,8 +242,8 @@ def neutron_plugin_relation_joined(rid=None, remote_restart=False):
rel_settings['restart_trigger'] = str(uuid.uuid4())
relation_set(relation_id=rid, **rel_settings)
@restart_on_change(restart_map())
@hooks.hook('neutron-plugin-relation-changed')
@restart_on_change(restart_map())
def neutron_plugin_relation_changed():
CONFIGS.write_all()

5
templates/icehouse/neutron-server
View File

@ -2,6 +2,11 @@
###############################################################################
# [ WARNING ]
# Configuration file maintained by Juju. Local changes may be overwritten.
{% if sections and 'COMMENT' in sections -%}
{% for key, value in sections['COMMENT'] -%}
# {{ value }}
{% endfor -%}
{% endif -%}
###############################################################################
{% if sections and 'DEFAULT' in sections -%}
{% for key, value in sections['DEFAULT'] -%}

7
templates/icehouse/neutron.conf
View File

@ -1,6 +1,11 @@
###############################################################################
# [ WARNING ]
# Configuration file maintained by Juju. Local changes may be overwritten.
{% if sections and 'COMMENT' in sections -%}
{% for key, value in sections['COMMENT'] -%}
# {{ value }}
{% endfor -%}
{% endif -%}
###############################################################################
[DEFAULT]
state_path = /var/lib/neutron
@ -68,4 +73,4 @@ admin_password = {{ admin_password }}
[service_providers]
service_provider=LOADBALANCER:Haproxy:neutron.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
service_provider=VPN:openswan:neutron.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default
service_provider=FIREWALL:Iptables:neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver:default
service_provider=FIREWALL:Iptables:neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver:default