X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=ci%2F01-deploybundle.sh;h=5ab56eb60a87fe11d24303515b5f22d6898af9f3;hb=ca424fd93cbba012a7dee84db1d6fea112952ef9;hp=cf8d3844beb96db46318ed8eba8908fd21d5529e;hpb=fbfff35468e2843d2df4209cf376fd34da25a6ab;p=joid.git

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index cf8d3844..5ab56eb6 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -7,8 +7,8 @@ set -ex
     #copy and download charms
     cp $4/fetch-charms.sh ./fetch-charms.sh
     #modify the ubuntu series wants to deploy
-    sed -i -- "s|trusty|$6|g" ./fetch-charms.sh
-    sh ./fetch-charms.sh
+    sed -i -- "s|distro=trusty|distro=$6|g" ./fetch-charms.sh
+    sh ./fetch-charms.sh $6
 
 
 case "$1" in
@@ -28,63 +28,27 @@ case "$1" in
         ;;
 esac
 
-#changing the target to the openstack release we want to deploy. 
-sed -i -- "s|mitaka|$2|g" ./bundles.yaml
 
-#changing the target to the ubuntu distro we want to deploy. 
-sed -i -- "s|trusty|$6|g" ./bundles.yaml
+#read the value from deployment.yaml
+if [ -e ~/.juju/deployment.yaml ]; then
+
+   cp ~/.juju/deployment.yaml ./deployment.yaml
+   cp ~/.juju/deployconfig.yaml ./deployconfig.yaml
+
+   extport=`grep "ext-port" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
+   sed --i "s@#ext-port: \"eth1\"@ext-port: \"$extport\"@g" ./bundles.yaml
+
+   datanet=`grep "dataNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
+   sed --i "s@#os-data-network: 10.4.8.0/21@os-data-network: $datanet@g" ./bundles.yaml
+
+   admnet=`grep "admNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
+   sed --i "s@10.4.1.1@$admnet@g" ./bundles.yaml
+
+   cephdisk=`grep "disk" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
+   sed --i "s@osd-devices: /srv@osd-devices: $cephdisk@g" ./bundles.yaml
+fi
 
 case "$3" in
-    'orangepod1' )
-        # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
-         sed -i -- 's/10.4.1.1/192.168.1.2/g' ./bundles.yaml
-        # choose the correct interface to use for data network
-         sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 192.168.11.0\/24/g' ./bundles.yaml
-        # Choose the external port to go out from gateway to use.
-         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
-        # Use host for public API for Orange pod2
-        # sed -i -- 's/#os-public-hostname: api.public-fqdn/os-public-hostname: api.pod2.opnfv.fr/g' ./bundles.yaml
-         ;;
-    'orangepod2' )
-        # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
-         sed -i -- 's/10.4.1.1/192.168.2.2/g' ./bundles.yaml
-        # choose the correct interface to use for data network
-         sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 192.168.12.0\/24/g' ./bundles.yaml
-        # Choose the external port to go out from gateway to use.
-         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
-        # Use host for public API for Orange pod2
-        # sed -i -- 's/#os-public-hostname: api.public-fqdn/os-public-hostname: api.pod2.opnfv.fr/g' ./bundles.yaml
-         ;;
-     'intelpod9' )
-        # As per your lab vip address list be deafult uses 10.9.1.11 - 10.9.1.20
-         sed -i -- 's/10.4.1.1/10.9.1.2/g' ./bundles.yaml
-        # choose the correct interface to use for data network
-         sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.9.12.0\/24/g' ./bundles.yaml
-        # Choose the external port to go out from gateway to use.
-         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1.905"/g' ./bundles.yaml
-        # Provide the gateway MAC to route the traffic externally.
-         sed -i -- 's/#gateway-mac: "default"/gateway-mac: "default"/g' ./bundles.yaml
-         ;;
-     'intelpod6' )
-        # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
-         sed -i -- 's/10.4.1.1/10.6.1.2/g' ./bundles.yaml
-        # choose the correct interface to use for data network
-         sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.6.12.0\/24/g' ./bundles.yaml
-        # Choose the external port to go out from gateway to use.
-         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth5"/g' ./bundles.yaml
-        # Provide the gateway MAC to route the traffic externally.
-         sed -i -- 's/#gateway-mac: "default"/gateway-mac: "default"/g' ./bundles.yaml
-         ;;
-     'intelpod5' )
-        # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
-         sed -i -- 's/10.4.1.1/10.5.1.2/g' ./bundles.yaml
-        # choose the correct interface to use for data network
-         sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.5.12.0\/24/g' ./bundles.yaml
-        # Choose the external port to go out from gateway to use.
-         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth5"/g' ./bundles.yaml
-        # Provide the gateway MAC to route the traffic externally.
-         sed -i -- 's/#gateway-mac: "default"/gateway-mac: "default"/g' ./bundles.yaml
-        ;;
      'attvirpod1' )
         # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
          sed -i -- 's/10.4.1.1/192.168.10.1/g' ./bundles.yaml
@@ -108,36 +72,63 @@ case "$3" in
      'ravellodemopod' )
          sed -i -- 's/#ext-port: "eth1"/ext-port: "eth2"/g' ./bundles.yaml
         ;;
-     'custom' )
-         sed -i -- 's/10.4.1.1/192.168.122.1/g' ./bundles.yaml
-         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
-        ;;
      'default' )
          sed -i -- 's/10.4.1.1/192.168.122.1/g' ./bundles.yaml
          sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
         ;;
 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
+# lets put the if seperateor as "," as this will save me from world.
+IFS=","
+
+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/#enable-dpdk: true/enable-dpdk: 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
         ;;
-    'odl_l3' )
-         sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-beryllium-l3"/g' ./bundles.yaml
+    'xenial' )
+        #changing the target to the ubuntu distro we want to deploy.
+        sed -i -- "s|trusty|$6|g" ./bundles.yaml
         ;;
 esac
 
 echo "... Deployment Started ...."
-        juju-deployer -vW -d -t 3600 -c bundles.yaml $6-"$2"-nodes
-        juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $6-"$2"
+    juju-deployer -vW -d -t 3600 -c bundles.yaml $6-"$2"-nodes
+    juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $6-"$2"