Merge "Auto Generated INFO.yaml file"

[joid.git] / ci / genMAASConfig.py

diff --git a/ci/genMAASConfig.py b/ci/genMAASConfig.py
index c3bc92f..8a3f557 100644 (file)
--- a/ci/genMAASConfig.py
+++ b/ci/genMAASConfig.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/maas2/maas_tpl'
 
 HOME = os.environ['HOME']
 USER = os.environ['USER']