Merge "py3: Switch to Python 3 for OpenStack Rocky"

src/lib/charm/openstack/dragent.py

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

src/tests/tests.yaml

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