diff options
| author |   Guo Ruijing <ruijing.guo@intel.com> | 2017-10-18 19:56:15 -0400 |
|---|---|---|
| committer |   Narinder Gupta <narinder.gupta@canonical.com> | 2017-12-13 16:36:50 +0000 |
| commit | d27608283966794e0b93cd9ce12412f6ab8d16e4 (patch) | |
| tree | 3901bc662f47e6ada1cc335322edddcb0bd9fbf2 /ci/genBundle.py | |
| parent | 06afa960e508c999b9dd96488c1aef01f222fba0 (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>
(cherry picked from commit 2819ba063c1a9896ccf437f85ca4c2ee463d7e80)
Diffstat (limited to 'ci/genBundle.py')
| -rw-r--r-- | ci/genBundle.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ci/genBundle.py b/ci/genBundle.py index 1bd09bb0..ffe9cb8f 100644 --- a/ci/genBundle.py +++ b/ci/genBundle.py @@ -35,13 +35,7 @@ labconfig_file = options.lab # scenarioconfig_file = 'default_deployment_config.yaml' -# 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/bundle_tpl' -else: - TPL_DIR = os.path.dirname(os.path.abspath(__file__))+'/config_tpl/bundle_tpl' +TPL_DIR = os.path.dirname(os.path.abspath(__file__))+'/config_tpl/juju2/bundle_tpl' # # Prepare variables |