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

diff --git a/ci/genBundle.py b/ci/genBundle.py
index 3aa5bcee..78dfae04 100644
--- a/ci/genBundle.py
+++ b/ci/genBundle.py
@@ -143,7 +143,7 @@ for storage in config['opnfv']['storage']:
 
 # Set default scenario name
 if not scenario:
-    scenario = "os-nosdn-nofeature-nonha"
+    scenario = "os-nosdn-nofeature-noha"
 
 # Parse scenario name
 try:
@@ -169,6 +169,9 @@ config['os']['ha']['mode'] = hamode
 # change ha mode
 config['os']['network']['controller'] = sdn
 
+if 'ocl' in sdn:
+    config['os']['hyperconverged'] = False
+
 # Change features
 if 'lxd' in features:
     config['os']['lxd'] = True
@@ -182,12 +185,20 @@ if 'sfc' in features:
     config['os']['network']['sfc'] = True
 if 'dpdk' in features:
     config['os']['network']['dpdk'] = True
+    config['os']['beta']['huge_pages'] = True
+    config['os']['beta']['cpu_pin'] = True
 if 'bgpvpn' in features:
     config['os']['network']['bgpvpn'] = True
 if 'odll3' in features:
     config['os']['network']['odll3'] = True
 if 'dishypcon' in features:
     config['os']['hyperconverged'] = False
+if 'hugepages' in features:
+    config['os']['beta']['huge_pages'] = True
+    config['os']['beta']['cpu_pin'] = True
+if 'openbaton' in features:
+    config['os']['service']['openbaton'] = True
+
 
 # Set beta option from extra
 if 'publicapi' in extra:
@@ -196,16 +207,19 @@ 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 'trusty' in extra:
     config['ubuntu']['release'] = 'trusty'
     if 'liberty' in extra:
         config['os']['release'] = 'liberty'
 if 'xenial' in extra:
     config['ubuntu']['release'] = 'xenial'
-    if 'newton' in extra:
-        config['os']['release'] = 'newton'
 if 'dishypcon' in extra:
     config['os']['hyperconverged'] = False
+if 'openbaton' in features:
+    config['os']['service']['openbaton'] = True
 
 #
 # Transform template to bundle.yaml according to config