From 063aadd4df480fb474fcbbc1ab386682321a57a6 Mon Sep 17 00:00:00 2001
From: Chris MacNaughton <chris.macnaughton@canonical.com>
Date: Wed, 20 Jun 2018 17:04:11 +0200
Subject: [PATCH] add MODEL_NAME variable to determine model

---
 zaza/model.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/zaza/model.py b/zaza/model.py
index dccfb3b..9448075 100644
--- a/zaza/model.py
+++ b/zaza/model.py
@@ -51,8 +51,11 @@ def get_juju_model():
         # Check the environment
         CURRENT_MODEL = os.environ["JUJU_MODEL"]
     except KeyError:
-        # If unset connect get the current active model
-        CURRENT_MODEL = get_current_model()
+        try:
+            CURRENT_MODEL = os.environ["MODEL_NAME"]:
+        except KeyError:
+            # If unset connect get the current active model
+            CURRENT_MODEL = get_current_model()
     return CURRENT_MODEL