Sync charm-helpers to enable Ubuntu Disco

Change-Id: I195c86d8cffa200284777d495e70ae620f5b7691
2019-04-05 17:15:27 +02:00 · 2019-04-05 17:15:27 +02:00 · c6985dd40e
commit c6985dd40e
parent 649312602c
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',
 )