From 77c57df9c6186a115b9782d8e54375fac3c35dd2 Mon Sep 17 00:00:00 2001
From: David Ames <david.ames@canonical.com>
Date: Fri, 7 Sep 2018 15:42:17 -0700
Subject: [PATCH] Must use the snap version of agents when using edge version
 of juju

---
 unit_tests/test_zaza_charm_lifecycle_prepare.py | 1 -
 zaza/charm_lifecycle/prepare.py                 | 1 -
 2 files changed, 2 deletions(-)

diff --git a/unit_tests/test_zaza_charm_lifecycle_prepare.py b/unit_tests/test_zaza_charm_lifecycle_prepare.py
index 52d89bc..ce7a21e 100644
--- a/unit_tests/test_zaza_charm_lifecycle_prepare.py
+++ b/unit_tests/test_zaza_charm_lifecycle_prepare.py
@@ -75,7 +75,6 @@ class TestCharmLifecyclePrepare(ut_utils.BaseTestCase):
         self.add_model.assert_called_once_with(
             'newmodel',
             config={
-                'agent-stream': 'proposed',
                 'default-series': 'xenial',
                 'image-stream': 'daily',
                 'test-mode': 'true',
diff --git a/zaza/charm_lifecycle/prepare.py b/zaza/charm_lifecycle/prepare.py
index 993d85b..51f9a96 100644
--- a/zaza/charm_lifecycle/prepare.py
+++ b/zaza/charm_lifecycle/prepare.py
@@ -25,7 +25,6 @@ import zaza.model
 MODEL_DEFAULTS = {
     # Model defaults from charm-test-infra
     #   https://jujucharms.com/docs/2.1/models-config
-    'agent-stream': 'proposed',
     'default-series': 'xenial',
     'image-stream': 'daily',
     'test-mode': 'true',