py3: Switch to Python 3 for OpenStack Rocky

Add rocky charm target to switch OpenStack Rocky deployments to
use Python 3.

Switch default smoke target to rocky.

Change-Id: Icd12098a7b05cad3fe82138be21b940492a74df6
This commit is contained in:
James Page 2018-09-19 12:30:08 +02:00
parent 848d318ad3
commit 39a3589963
2 changed files with 27 additions and 3 deletions

View File

@ -24,8 +24,18 @@ import charmhelpers.contrib.network.ip as ch_ip
import charms_openstack.charm
import charms_openstack.adapters as os_adapters
PACKAGES = ['neutron-bgp-dragent', 'neutron-dynamic-routing-common',
'python-neutron-dynamic-routing']
PACKAGES = [
'neutron-bgp-dragent',
'neutron-dynamic-routing-common',
'python-neutron-dynamic-routing',
]
PY3_PACKAGES = [
'neutron-bgp-dragent',
'neutron-dynamic-routing-common',
'python3-neutron-dynamic-routing',
]
NEUTRON_DIR = '/etc/neutron/'
NEUTRON_CONF = NEUTRON_DIR + "neutron.conf"
DRAGENT_CONF = NEUTRON_DIR + "bgp_dragent.ini"
@ -221,3 +231,17 @@ class DRAgentCharm(charms_openstack.charm.OpenStackCharm):
"""
pass
class RockyDRAgentCharm(DRAgentCharm):
release = 'rocky'
packages = PY3_PACKAGES
purge_packages = [
'python-neutron-dynamic-routing',
'python-memcache',
]
python_version = 3

View File

@ -9,6 +9,6 @@ gate_bundles:
- xenial-pike-functional
- xenial-queens-functional
smoke_bundles:
- bionic-queens-functional
- bionic-rocky-functional
tests:
- zaza.charm_tests.dragent.tests.DRAgentTest