From 0976957626cf69fb577417b1596ba4f363717314 Mon Sep 17 00:00:00 2001
From: David Ames <david.ames@canonical.com>
Date: Fri, 2 Dec 2016 13:38:49 -0800
Subject: [PATCH] Fix amulet tests that reference trusty_juno

Juno has been deprecated. A recent charm helper sysnc removed
references to trusty_juno. Therefore it is no longer defined.
Move checks back to icehouse.

Change-Id: I0272ad4f7a2339c6f60b4ba8a6ddfcb76cc3ded7
---
 tests/basic_deployment.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index de4f385b..b8e2f41a 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -604,7 +604,7 @@ class KeystoneBasicDeployment(OpenStackAmuletDeployment):
                 'admin_port': '35347',
                 'public_port': '4990',
             }
-        elif self._get_openstack_release() <= self.trusty_juno:
+        elif self._get_openstack_release() <= self.trusty_icehouse:
             # Juno and earlier
             expected['DEFAULT'].update({
                 'admin_port': '35347',