diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2017-10-27 08:31:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-27 08:31:56 +0000 |
| commit | cad8852bf819f51f2e9602b11d4fc8b723623006 (patch) | |
| tree | d78bf4fb4ebd94df2a7d8209944b879b9c1fd1c0 /ci/depMAAS.py | |
| parent | 0b6cf885239f5612c19db205d9a827572ad73c8a (diff) | |
| parent | 2819ba063c1a9896ccf437f85ca4c2ee463d7e80 (diff) | |
Merge "cleanup code"
Diffstat (limited to 'ci/depMAAS.py')
| -rw-r--r-- | ci/depMAAS.py | 9 |
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'] |