From 2347e2c74249e30c6bab6764ac6e8e49e01ae90a Mon Sep 17 00:00:00 2001
From: Chris MacNaughton <chris.macnaughton@canonical.com>
Date: Fri, 5 Apr 2019 17:13:30 +0200
Subject: [PATCH] Sync charm-helpers to enable Ubuntu Disco

Change-Id: I1129cbef394953dacf6756536cd0e3ea27458675
---
 charmhelpers/contrib/openstack/amulet/deployment.py | 1 +
 charmhelpers/core/host_factory/ubuntu.py            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/charmhelpers/contrib/openstack/amulet/deployment.py b/charmhelpers/contrib/openstack/amulet/deployment.py
index d1270a73..8e57467b 100644
--- 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]
diff --git a/charmhelpers/core/host_factory/ubuntu.py b/charmhelpers/core/host_factory/ubuntu.py
index a3162fac..0ee2b660 100644
--- a/charmhelpers/core/host_factory/ubuntu.py
+++ b/charmhelpers/core/host_factory/ubuntu.py
@@ -23,6 +23,7 @@ UBUNTU_RELEASES = (
     'artful',
     'bionic',
     'cosmic',
+    'disco',
 )