Sync charm-helpers to enable Ubuntu Disco

Change-Id: I48e0e954a4dc3a3f32174a4da39a635073e4ddf2
2019-04-05 17:17:40 +02:00 · 2019-04-05 17:17:40 +02:00 · 4258e84309
commit 4258e84309
parent 220f1d8efa
2 changed files with 2 additions and 0 deletions
--- a/charmhelpers/contrib/openstack/amulet/deployment.py
+++ b/charmhelpers/contrib/openstack/amulet/deployment.py
@ -312,6 +312,7 @@ class OpenStackAmuletDeployment(AmuletDeployment):
            ('artful', 'pike'),
            ('bionic', 'queens'),
            ('cosmic', 'rocky'),
+            ('disco', 'stein'),
        ])
        if self.openstack:
            os_origin = self.openstack.split(':')[1]
--- a/charmhelpers/core/host_factory/ubuntu.py
+++ b/charmhelpers/core/host_factory/ubuntu.py
@ -23,6 +23,7 @@ UBUNTU_RELEASES = (
    'artful',
    'bionic',
    'cosmic',
+    'disco',
 )