Sync charm-helpers to enable Ubuntu Disco

Change-Id: If57b1d477c1562f1222dc05e419fc762d7c64d39
2019-04-05 17:11:55 +02:00 · 2019-04-05 17:11:55 +02:00 · 506d5e9bf9
parent 09af829f59
commit 506d5e9bf9
2 changed files with 2 additions and 0 deletions
--- a/hooks/charmhelpers/contrib/openstack/amulet/deployment.py
+++ b/hooks/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/hooks/charmhelpers/core/host_factory/ubuntu.py
+++ b/hooks/charmhelpers/core/host_factory/ubuntu.py
@ -23,6 +23,7 @@ UBUNTU_RELEASES = (
    'artful',
    'bionic',
    'cosmic',
+    'disco',
 )