From ce1b5a8bf0d0b92a321a45027c964b870e7f3e2d Mon Sep 17 00:00:00 2001 From: Hui Xiang Date: Fri, 9 Jan 2015 16:00:15 +0800 Subject: [PATCH] set up changes for option ha-legacy-mode --- hooks/quantum_hooks.py | 3 +++ hooks/quantum_utils.py | 1 + 2 files changed, 4 insertions(+) diff --git a/hooks/quantum_hooks.py b/hooks/quantum_hooks.py index 0b7dbbf9..0b6f7ebb 100755 --- a/hooks/quantum_hooks.py +++ b/hooks/quantum_hooks.py @@ -118,7 +118,10 @@ def config_changed(): else: apt_purge('neutron-l3-agent') + # Setup legacy ha configurations update_legacy_ha_files() + for r_id in relation_ids('ha'): + ha_relation_joined() @hooks.hook('upgrade-charm') diff --git a/hooks/quantum_utils.py b/hooks/quantum_utils.py index ace8129f..663eeb07 100644 --- a/hooks/quantum_utils.py +++ b/hooks/quantum_utils.py @@ -649,6 +649,7 @@ def update_legacy_ha_files(force=False): if config('ha-legacy-mode'): install_legacy_ha_files(force=force) else: + delete_legacy_resources() remove_legacy_ha_files()