modified for Kubernetes.

Change-Id: Ibe3c04f7988bfb1f9907ecd82c04ea5d22575eef
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>

diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index 6d2ead1..26946bd 100755 (executable)
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -16,7 +16,7 @@ if [[ "$opnfvmodel" = "openstack" ]]; then
     #copy and download charms
     cp $opnfvsdn/fetch-charms.sh ./fetch-charms.sh
 else
-    cp kubernates/fetch-charms.sh ./fetch-charms.sh
+    cp kubernetes/fetch-charms.sh ./fetch-charms.sh
 fi
 
 jujuver=`juju --version`

diff --git a/ci/default_deployment_config.yaml b/ci/default_deployment_config.yaml
index 61bd9f0..aa1ca08 100644 (file)
--- a/ci/default_deployment_config.yaml
+++ b/ci/default_deployment_config.yaml
@@ -31,5 +31,6 @@ os:
         congress: True
         promise: True
         bindings: False
-    kubernetes:
+k8:
+    feature:
         loadbalancer: False

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 9d24d2f..c44eaba 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -32,7 +32,7 @@ usage() { echo "Usage: $0 [-s <nosdn|odl|opencontrail>]
                          [-f <ipv6,dpdk,lxd,dvr>]
                          [-d <trusty|xenial>]
                          [-a <amd64>]
-                         [-m <openstack|kubernates>]
+                         [-m <openstack|kubernetes>]
                          [-r <a|b>]" 1>&2 exit 1; }
 
 while getopts ":s:t:o:l:h:r:f:d:a:m:" opt; do

diff --git a/ci/genK8Bundle.py b/ci/genK8Bundle.py
index cfbb6ea..81deb5c 100644 (file)
--- a/ci/genK8Bundle.py
+++ b/ci/genK8Bundle.py
@@ -163,13 +163,13 @@ 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
 
 # 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: