X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2FgenBundle.py;h=de0f879ed2930344d6884c62c591956817cb2dfd;hb=149e7053b83b2236eac66701837c0d183bb25b81;hp=78dfae042c9be4b9c6ccba55cfddd1cb1f1e8383;hpb=ed47542253ad4a31af5d64b25a75c0e2d656836a;p=joid.git

diff --git a/ci/genBundle.py b/ci/genBundle.py
index 78dfae04..de0f879e 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
@@ -201,19 +195,19 @@ if 'openbaton' in features:
 
 
 # Set beta option from extra
-if 'publicapi' in extra:
-    config['os']['beta']['public_api'] = True
 if 'radosgwcluster' in extra:
     config['os']['beta']['hacluster_ceph_radosgw'] = True
 if 'hugepages' in extra:
     config['os']['beta']['huge_pages'] = True
     config['os']['beta']['cpu_pin'] = True
-if 'mitaka' in extra:
-    config['os']['release'] = 'mitaka'
+if 'ocata' in extra:
+    config['os']['release'] = 'ocata'
+if 'pike' in extra:
+    config['os']['release'] = 'pike'
 if 'trusty' in extra:
     config['ubuntu']['release'] = 'trusty'
-    if 'liberty' in extra:
-        config['os']['release'] = 'liberty'
+    if 'ocata' in extra:
+        config['os']['release'] = 'mitaka'
 if 'xenial' in extra:
     config['ubuntu']['release'] = 'xenial'
 if 'dishypcon' in extra: