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

Change-Id: Ibd2954767fa03bdac871d0396b9815c6cc2d46ee
---
 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 d1270a7..8e57467 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 a3162fa..0ee2b66 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',
 )