Code Review
/
joid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
modified as docker does not installed so use python.
[joid.git]
/
ci
/
genMAASConfig.py
diff --git
a/ci/genMAASConfig.py
b/ci/genMAASConfig.py
index
c3bc92f
..
9417f71
100644
(file)
--- a/
ci/genMAASConfig.py
+++ b/
ci/genMAASConfig.py
@@
-36,9
+36,9
@@
labconfig_file = options.lab
jujuver = subprocess.check_output(["juju", "--version"])
if LooseVersion(jujuver) >= LooseVersion('2'):
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'
+else:
+ TPL_DIR = os.path.dirname(os.path.abspath(__file__))+'/config_tpl/maas_tpl'
HOME = os.environ['HOME']
USER = os.environ['USER']
HOME = os.environ['HOME']
USER = os.environ['USER']