X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2FgenMAASConfig.py;h=9417f71c8b71618bcdd35a73b4473c6144ca690e;hb=38256368b7d330e2ce1309cc0a64bf57bbeeae41;hp=2b4948dcd67f64fb7b57059860ee1b10fafaf77f;hpb=5cc5559348a8a18a41cfd25cce446955d63afb83;p=joid.git

diff --git a/ci/genMAASConfig.py b/ci/genMAASConfig.py
index 2b4948dc..9417f71c 100644
--- a/ci/genMAASConfig.py
+++ b/ci/genMAASConfig.py
@@ -10,7 +10,9 @@ Parameters:
 
 from optparse import OptionParser
 from jinja2 import Environment, FileSystemLoader
+from distutils.version import LooseVersion, StrictVersion
 import os
+import subprocess
 import yaml
 from pprint import pprint as pp
 import socket
@@ -31,7 +33,13 @@ labconfig_file = options.lab
 #
 
 # Capture our current directory
-TPL_DIR = os.path.dirname(os.path.abspath(__file__))+'/config_tpl/maas_tpl'
+jujuver = subprocess.check_output(["juju", "--version"])
+
+if LooseVersion(jujuver) >= LooseVersion('2'):
+    TPL_DIR = os.path.dirname(os.path.abspath(__file__))+'/config_tpl/maas2/maas_tpl'
+else:
+    TPL_DIR = os.path.dirname(os.path.abspath(__file__))+'/config_tpl/maas_tpl'
+
 HOME = os.environ['HOME']
 USER = os.environ['USER']