Move NEUTRON_CONF out of the way which as the benefit of triggering a neutron restart on api relation break
This commit is contained in:
parent
ce1fe0d102
commit
cf5c000e2c
|
@ -0,0 +1 @@
|
||||||
|
nova_cc_hooks.py
|
|
@ -510,22 +510,23 @@ def upgrade_charm():
|
||||||
def neutron_api_relation_joined():
|
def neutron_api_relation_joined():
|
||||||
with open('/etc/init/neutron-server.override', 'wb') as out:
|
with open('/etc/init/neutron-server.override', 'wb') as out:
|
||||||
out.write('manual\n')
|
out.write('manual\n')
|
||||||
|
os.rename(NEUTRON_CONF, NEUTRON_CONF + '_unused')
|
||||||
if service_running('neutron-server'):
|
if service_running('neutron-server'):
|
||||||
service_stop('neutron-server')
|
service_stop('neutron-server')
|
||||||
for rid in relation_ids('identity-service'):
|
for rid in relation_ids('identity-service'):
|
||||||
identity_joined(rid=rid)
|
identity_joined(rid=rid)
|
||||||
|
|
||||||
@hooks.hook('neutron-api-relation-changed')
|
@hooks.hook('neutron-api-relation-changed')
|
||||||
|
@restart_on_change(restart_map())
|
||||||
def neutron_api_relation_changed():
|
def neutron_api_relation_changed():
|
||||||
CONFIGS.write(NOVA_CONF)
|
CONFIGS.write(NOVA_CONF)
|
||||||
|
|
||||||
@hooks.hook('neutron-api-relation-broken')
|
@hooks.hook('neutron-api-relation-broken')
|
||||||
|
@restart_on_change(restart_map())
|
||||||
def neutron_api_relation_broken():
|
def neutron_api_relation_broken():
|
||||||
CONFIGS.write_all()
|
|
||||||
if os.path.isfile('/etc/init/neutron-server.override'):
|
if os.path.isfile('/etc/init/neutron-server.override'):
|
||||||
os.remove('/etc/init/neutron-server.override')
|
os.remove('/etc/init/neutron-server.override')
|
||||||
if not service_running('neutron-server'):
|
CONFIGS.write_all()
|
||||||
service_start('neutron-server')
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
try:
|
try:
|
||||||
|
|
Loading…
Reference in New Issue