From ccaeb3ff2bc5c119dc6e89d4d844774bcd1679bb Mon Sep 17 00:00:00 2001 From: James Page Date: Thu, 15 Nov 2018 11:09:55 +0000 Subject: [PATCH] Deal with py2-py3 payload switch during upgrade-charm Switch to using the default upgrade-charm handler as provided by charms.openstack and associated layers. This ensures that the payload execution switch from py2->py3 at OpenStack Rocky is implemented during the charm upgrade process. Change-Id: I8dc19abe813fb78f16cfb0abdbb40cf2ee9a4e6e Closes-Bug: 1803451 --- .gitignore | 1 + src/lib/charm/openstack/aodh.py | 5 ++++- src/reactive/aodh_handlers.py | 5 ----- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index a0b2628..1f101ef 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,6 @@ layers .tox interfaces .testrepository +.stestr *__pycache__* *.pyc diff --git a/src/lib/charm/openstack/aodh.py b/src/lib/charm/openstack/aodh.py index 0428874..fc5ae6d 100644 --- a/src/lib/charm/openstack/aodh.py +++ b/src/lib/charm/openstack/aodh.py @@ -30,7 +30,10 @@ AODH_API_SYSTEMD_CONF = ( AODH_WSGI_CONF = '/etc/apache2/sites-available/aodh-api.conf' -charms_openstack.charm.use_defaults('charm.default-select-release') +charms_openstack.charm.use_defaults( + 'charm.default-select-release', + 'upgrade-charm' +) class AodhAdapters(charms_openstack.adapters.OpenStackAPIRelationAdapters): diff --git a/src/reactive/aodh_handlers.py b/src/reactive/aodh_handlers.py index 9c41da2..ba366d6 100644 --- a/src/reactive/aodh_handlers.py +++ b/src/reactive/aodh_handlers.py @@ -99,11 +99,6 @@ def cluster_connected(hacluster): aodh.configure_ha_resources(hacluster) -@reactive.hook('upgrade-charm') -def upgrade_charm(): - aodh.install() - - # TODO: drop once charm switches to apache+mod_wsgi @reactive.when_file_changed(aodh.AODH_API_SYSTEMD_CONF) def systemd_override_changed():