openstack/charm-aodh
Code Issues Proposed changes

Deal with py2-py3 payload switch during upgrade-charm

Browse Source 
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
This commit is contained in:
James Page 2018-11-15 11:09:55 +00:00
parent 759140e708
commit ccaeb3ff2b
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,5 +3,6 @@ layers
.tox
interfaces
.testrepository
.stestr
*__pycache__*
*.pyc

5
src/lib/charm/openstack/aodh.py
View File

@ -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):

5
src/reactive/aodh_handlers.py
View File

@ -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():