summaryrefslogtreecommitdiffstats
path: root/ci/depMAAS.py
diff options
context:
space:
mode:
Diffstat (limited to 'ci/depMAAS.py')
-rw-r--r--ci/depMAAS.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/ci/depMAAS.py b/ci/depMAAS.py
index 5592bc46..3a16b1e4 100644
--- a/ci/depMAAS.py
+++ b/ci/depMAAS.py
@@ -31,14 +31,7 @@ labconfig_file = options.lab
#
# Set Path and configs path
#
-
-# Capture our current directory
-jujuver = subprocess.check_output(["juju", "--version"])
-
-if LooseVersion(jujuver) >= LooseVersion('2'):
- TPL_DIR = os.path.dirname(os.path.abspath(__file__))+'/config_tpl/maas_tpl'
-else:
- TPL_DIR = os.path.dirname(os.path.abspath(__file__))+'/config_tpl/maas2/maas_tpl'
+TPL_DIR = os.path.dirname(os.path.abspath(__file__))+'/config_tpl/maas_tpl'
HOME = os.environ['HOME']
USER = os.environ['USER']