Change the deployment mode from 'nonha' to 'noha'

[joid.git] / ci / genBundle.py

diff --git a/ci/genBundle.py b/ci/genBundle.py
index 55f3f6e..78dfae0 100644 (file)
--- a/ci/genBundle.py
+++ b/ci/genBundle.py
@@ -12,7 +12,9 @@ Parameters:
 
 from optparse import OptionParser
 from jinja2 import Environment, FileSystemLoader
+from distutils.version import LooseVersion, StrictVersion
 import os
+import subprocess
 import random
 import yaml
 import sys
@@ -34,7 +36,12 @@ labconfig_file = options.lab
 
 scenarioconfig_file = 'default_deployment_config.yaml'
 # Capture our current directory
-TPL_DIR = os.path.dirname(os.path.abspath(__file__))+'/config_tpl/bundle_tpl'
+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'
 
 #
 # Prepare variables
@@ -136,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:
@@ -162,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
@@ -175,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:
@@ -189,12 +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 'dishypcon' in extra:
     config['os']['hyperconverged'] = False
+if 'openbaton' in features:
+    config['os']['service']['openbaton'] = True
 
 #
 # Transform template to bundle.yaml according to config