Merge "Auto Generated INFO.yaml file"

[joid.git] / ci / genK8Bundle.py

diff --git a/ci/genK8Bundle.py b/ci/genK8Bundle.py
index cfbb6ea..688d18e 100644 (file)
--- a/ci/genK8Bundle.py
+++ b/ci/genK8Bundle.py
@@ -35,9 +35,6 @@ labconfig_file = options.lab
 #
 
 scenarioconfig_file = 'default_deployment_config.yaml'
-# Capture our current directory
-jujuver = subprocess.check_output(["juju", "--version"])
-
 TPL_DIR = os.path.dirname(os.path.abspath(__file__))+'/config_tpl/juju2/bundlek8_tpl'
 
 #
@@ -163,13 +160,18 @@ except ValueError as err:
 if 'dpdk' in features:
     config['os']['network']['dpdk'] = True
 if 'lb' in features:
-    config['os']['kubernetes']['loadbalancer'] = True
+    config['k8']['feature']['loadbalancer'] = True
+if 'ceph' in features:
+    config['k8']['feature']['storage'] = 'ceph'
+
+# change ha mode
+config['k8']['network']['controller'] = sdn
 
 # Set beta option from extra
 if 'hugepages' in extra:
     config['os']['beta']['huge_pages'] = True
 if 'lb' in extra:
-    config['os']['kubernetes']['loadbalancer'] = True
+    config['k8']['feature']['loadbalancer'] = True
 if 'mitaka' in extra:
     config['os']['release'] = 'mitaka'
 if 'xenial' in extra: