modified for right syntax.

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

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 6f6f0e2..9072409 100755 (executable)
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -113,6 +113,9 @@ case "$3" in
         ;;
 esac
 
+# lets put the if seperateor as "," as this will save me from world.
+IFS=","
+
 for feature in $5; do
     case "$feature" in
         'ipv6' )

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 8cc0bd7..0a91b4a 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -26,7 +26,7 @@ usage() { echo "Usage: $0 [-s <nosdn|odl|opencontrail>]
                          [-t <nonha|ha|tip>] 
                          [-o <juno|liberty>]
                          [-l <default|intelpod5>]
-                         [-f <ipv6|l2|l3|dvr>]
+                         [-f <ipv6|dpdk|lxd|dvr>]
                          [-d <trusty|xenial>]
                          [-a <amd64>]
                          [-r <a|b>]" 1>&2 exit 1; } 

diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index cbc4233..5329f72 100644 (file)
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -137,7 +137,7 @@ openstack-phase2:
     - - heat:amqp
       - rabbitmq-server:amqp
     #- - nova-compute:lxd
-    #  - lxd:lxd
+      #- lxd:lxd
 
   services:
     hacluster-keystone:
@@ -307,7 +307,7 @@ openstack-phase2:
         enable-resize: true
         manage-neutron-plugin-legacy-mode: false
         migration-auth-type: ssh
-        #hugepages: '50%'
+        #hugepages: "50%"
         #virt-type: lxd
       to:
         - "nodes=1"

diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index 562263d..fa2a24b 100644 (file)
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -127,7 +127,7 @@ openstack-phase2:
     - - heat:amqp
       - rabbitmq-server:amqp
     #- - nova-compute:lxd
-    #  - lxd:lxd
+      #- lxd:lxd
   services:
     ceilometer:
       charm: "local:trusty/ceilometer"
@@ -239,7 +239,7 @@ openstack-phase2:
         enable-resize: true
         manage-neutron-plugin-legacy-mode: false
         migration-auth-type: ssh
-        #hugepages: '50%'
+        #hugepages: "50%"
         #virt-type: lxd
       to:
         - "nodes=1"

diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index 9b78d10..03e24ca 100644 (file)
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -123,7 +123,7 @@ openstack-phase2:
     - - "ceph-radosgw:identity-service"
       - "keystone:identity-service"
     #- - nova-compute:lxd
-    #  - lxd:lxd
+      #- lxd:lxd
   services:
     mysql:
       charm: "local:trusty/percona-cluster"
@@ -214,7 +214,7 @@ openstack-phase2:
         enable-resize: true
         manage-neutron-plugin-legacy-mode: false
         migration-auth-type: ssh
-        #hugepages: '50%'
+        #hugepages: "50%"
         #virt-type: lxd
       to:
         - "nodes=1"

diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index decb1cb..e33fa8e 100644 (file)
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -145,6 +145,8 @@ openstack-phase2:
       - "ceph:radosgw"
     - - "ceph-radosgw:identity-service"
       - "keystone:identity-service"
+    #- - nova-compute:lxd
+      #- lxd:lxd
   services:
     hacluster-keystone:
       charm: "local:trusty/hacluster"
@@ -322,6 +324,8 @@ openstack-phase2:
         enable-resize: true
         manage-neutron-plugin-legacy-mode: false
         migration-auth-type: ssh
+        #virt-type: lxd
+        #hugepages: "50%"
       to:
         - "nodes=1"
         - "nodes=2"

diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index 60c30a9..ae3be75 100644 (file)
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -126,6 +126,8 @@ openstack-phase2:
       - "ceph:radosgw"
     - - "ceph-radosgw:identity-service"
       - "keystone:identity-service"
+    #- - nova-compute:lxd
+      #- lxd:lxd
   services:
     mysql:
       charm: "local:trusty/percona-cluster"
@@ -214,6 +216,8 @@ openstack-phase2:
         enable-resize: true
         manage-neutron-plugin-legacy-mode: false
         migration-auth-type: ssh
+        #virt-type: lxd
+        #hugepages: "50%"
       to:
         - "nodes=1"
     nova-cloud-controller:

diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index f3a5d43..9034fea 100644 (file)
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -128,6 +128,8 @@ openstack-phase2:
       - "ceph:radosgw"
     - - "ceph-radosgw:identity-service"
       - "keystone:identity-service"
+    #- - nova-compute:lxd
+      #- lxd:lxd
   services:
     mysql:
       charm: "local:trusty/percona-cluster"
@@ -218,6 +220,8 @@ openstack-phase2:
         enable-resize: true
         manage-neutron-plugin-legacy-mode: false
         migration-auth-type: ssh
+        #hugepages: "50%"
+        #virt-type: lxd
       to:
         - "nodes=1"
     nova-cloud-controller: