diff options
| author |   Guo Ruijing <ruijing.guo@intel.com> | 2017-10-18 19:56:15 -0400 |
|---|---|---|
| committer | Guo Ruijing <ruijing.guo@intel.com> | 2017-10-18 20:02:51 -0400 |
| commit | 2819ba063c1a9896ccf437f85ca4c2ee463d7e80 (patch) | |
| tree | 3aa67c5165ed3dc73bcd85cdb836731f4e212f97 /ci/genDeploymentConfig.py | |
| parent | 470472f807b118b235d7ff473a3e58bfaf8c293d (diff) | |
cleanup code
1. remove unused code due to juju>2 & maas>2.2 in Ubuntu16.04
2. remove deprecated 03-maasdeploy.sh
3. remove other unused code
Change-Id: I20fd0e96400db1262b0df3ef2b502c8001dd5b76
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Diffstat (limited to 'ci/genDeploymentConfig.py')
| -rw-r--r-- | ci/genDeploymentConfig.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/ci/genDeploymentConfig.py b/ci/genDeploymentConfig.py index 0a21fffa..0d3a1c95 100644 --- a/ci/genDeploymentConfig.py +++ b/ci/genDeploymentConfig.py @@ -30,14 +30,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/juju2' -else: - TPL_DIR = os.path.dirname(os.path.abspath(__file__))+'/config_tpl' +TPL_DIR = os.path.dirname(os.path.abspath(__file__))+'/config_tpl/juju2' HOME = os.environ['HOME'] USER = os.environ['USER'] |