From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Tue, 31 May 2016 17:01:51 +0000 (-0500)
Subject: modfied to support LXD in charms.
X-Git-Tag: colorado.1.0~167
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F99%2F14899%2F1;p=joid.git

modfied to support LXD in charms.

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

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index df4dcb2b..e07ca0ed 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -28,19 +28,6 @@ case "$1" in
         ;;
 esac
 
-#changing the target to the openstack release we want to deploy. 
-sed -i -- "s|mitaka|$2|g" ./bundles.yaml
-
-#update source if trusty is target distribution
-case "$6" in
-    'trusty' )
-        sed -i -- "s|#source|source|g" ./bundles.yaml
-        ;;
-    'xenial' )
-        #changing the target to the ubuntu distro we want to deploy. 
-        sed -i -- "s|trusty|$6|g" ./bundles.yaml
-        ;;
-esac
 
 case "$3" in
     'orangepod1' )
@@ -126,26 +113,49 @@ case "$3" in
         ;;
 esac
 
-case "$5" in
-    'ipv6' )
-         sed -i -- 's/#prefer-ipv6: true/prefer-ipv6: true/g' ./bundles.yaml
-        ;;
-    'dvr' )
-         sed -i -- 's/#enable-dvr: true/enable-dvr: true/g' ./bundles.yaml
-         sed -i -- 's/#l2-population: true/l2-population: true/g' ./bundles.yaml
-        ;;
-    'sfc' )
-         sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-beryllium-sfc"/g' ./bundles.yaml
-        ;;
-    'vpn' )
-         sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-beryllium-vpn"/g' ./bundles.yaml
-        ;;
-    'odl_l3' )
-         sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-beryllium-l3"/g' ./bundles.yaml
+for feature in $5; do
+    case "$feature" in
+        'ipv6' )
+             sed -i -- 's/#prefer-ipv6: true/prefer-ipv6: true/g' ./bundles.yaml
+            ;;
+        'dvr' )
+             sed -i -- 's/#enable-dvr: true/enable-dvr: true/g' ./bundles.yaml
+             sed -i -- 's/#l2-population: true/l2-population: true/g' ./bundles.yaml
+            ;;
+        'sfc' )
+             sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-beryllium-sfc"/g' ./bundles.yaml
+            ;;
+        'vpn' )
+             sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-beryllium-vpn"/g' ./bundles.yaml
+            ;;
+        'odl_l3' )
+             sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-beryllium-l3"/g' ./bundles.yaml
+            ;;
+        'dpdk' )
+             sed -i -- 's/#dpdk_enable: true/dpdk_enable: true/g' ./bundles.yaml
+             sed -i -- 's/#hugepages: '50%'/hugepages: '50%'/g' ./bundles.yaml
+        'lxd' )
+             sed -i -- 's/#- - nova-compute:lxd/- - nova-compute:lxd/g' ./bundles.yaml
+             sed -i -- 's/#- - lxd:lxd/- - lxd:lxd/g' ./bundles.yaml
+             sed -i -- 's/#virt-type: lxd/virt-type: lxd/g' ./bundles.yaml
+             # adding the lxd subordinate charm
+             echo "    lxd:" >> ./bundles.yaml
+             echo "      charm: local:xenial/lxd" >> ./bundles.yaml
+            ;;
+    esac
+done
+
+#changing the target to the openstack release we want to deploy.
+sed -i -- "s|mitaka|$2|g" ./bundles.yaml
+
+#update source if trusty is target distribution
+case "$6" in
+    'trusty' )
+        sed -i -- "s|#source|source|g" ./bundles.yaml
         ;;
-    'dpdk' )
-         sed -i -- 's/#dpdk_enable: true/dpdk_enable: true/g' ./bundles.yaml
-         sed -i -- 's/#hugepages: '50%'/hugepages: '50%'/g' ./bundles.yaml
+    'xenial' )
+        #changing the target to the ubuntu distro we want to deploy.
+        sed -i -- "s|trusty|$6|g" ./bundles.yaml
         ;;
 esac
 
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index e9094fa3..cbc4233f 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -136,6 +136,8 @@ openstack-phase2:
       - keystone:identity-service
     - - heat:amqp
       - rabbitmq-server:amqp
+    #- - nova-compute:lxd
+    #  - lxd:lxd
 
   services:
     hacluster-keystone:
@@ -306,6 +308,7 @@ openstack-phase2:
         manage-neutron-plugin-legacy-mode: false
         migration-auth-type: ssh
         #hugepages: '50%'
+        #virt-type: lxd
       to:
         - "nodes=1"
         - "nodes=2"
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index 06792de5..562263d2 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -126,6 +126,8 @@ openstack-phase2:
       - keystone:identity-service
     - - heat:amqp
       - rabbitmq-server:amqp
+    #- - nova-compute:lxd
+    #  - lxd:lxd
   services:
     ceilometer:
       charm: "local:trusty/ceilometer"
@@ -238,6 +240,7 @@ openstack-phase2:
         manage-neutron-plugin-legacy-mode: false
         migration-auth-type: ssh
         #hugepages: '50%'
+        #virt-type: lxd
       to:
         - "nodes=1"
     openstack-dashboard:
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index 3661b862..9b78d108 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -122,6 +122,8 @@ openstack-phase2:
       - "ceph:radosgw"
     - - "ceph-radosgw:identity-service"
       - "keystone:identity-service"
+    #- - nova-compute:lxd
+    #  - lxd:lxd
   services:
     mysql:
       charm: "local:trusty/percona-cluster"
@@ -213,6 +215,7 @@ openstack-phase2:
         manage-neutron-plugin-legacy-mode: false
         migration-auth-type: ssh
         #hugepages: '50%'
+        #virt-type: lxd
       to:
         - "nodes=1"
     nova-cloud-controller: