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: I5e4b8df8ecf1829965952f85a0b5f69729f9f12c
Closes-Bug: 1803451
This commit is contained in:
James Page 2018-11-15 11:14:49 +00:00
parent 12e23cafd0
commit 7075c5d332
1 changed files with 4 additions and 1 deletions

View File

@ -37,7 +37,10 @@ RNDC_KEY_CONF = DESIGNATE_DIR + '/rndc.key'
NOVA_SINK_FILE = DESIGNATE_DIR + '/conf.d/nova_sink.cfg'
NEUTRON_SINK_FILE = DESIGNATE_DIR + '/conf.d/neutron_sink.cfg'
RC_FILE = '/root/novarc'
openstack_charm.use_defaults('charm.default-select-release')
openstack_charm.use_defaults(
'charm.default-select-release',
'upgrade-charm',
)
class DesignateDBAdapter(openstack_adapters.DatabaseRelationAdapter):