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/genBundle.py | |
parent | 0b6cf885239f5612c19db205d9a827572ad73c8a (diff) | |
parent | 2819ba063c1a9896ccf437f85ca4c2ee463d7e80 (diff) |
Merge "cleanup code"
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 |