modified to include the ODL Be support with sfc.

Change-Id: I7b376bc5afb8700152e654defaa19eb4d1d8393a
(cherry picked from commit 7524f897b4b43615c71ceb9853ab74b33d4ecdfb)

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 2888b3a..f8696dd 100755 (executable)
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -76,6 +76,15 @@ case "$5" in
          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-Be-sfc/g' ./bundles.yaml
+        ;;
+    'vpn' )
+         sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-Be-vpn/g' ./bundles.yaml
+        ;;
+    'odl_l3' )
+         sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-Be-l3/g' ./bundles.yaml
+        ;;
 esac
 
 echo "... Deployment Started ...."

diff --git a/ci/cleanvm.sh b/ci/cleanvm.sh
index 5277bf4..b9bf370 100755 (executable)
--- a/ci/cleanvm.sh
+++ b/ci/cleanvm.sh
@@ -8,20 +8,16 @@ set -ex
 echo " Cleanup Started ..."
 ./clean.sh
  
-sudo virsh destroy opnfv-maas || true
-sudo virsh destroy bootstrap || true
 sudo virsh destroy node1-control || true
 sudo virsh destroy node3-control || true
 sudo virsh destroy node4-control || true
 sudo virsh destroy node2-compute || true
 sudo virsh destroy node5-compute || true
-sudo virsh undefine opnfv-maas || true
-sudo virsh undefine bootstrap || true
 sudo virsh undefine node1-control || true
 sudo virsh undefine node3-control || true
 sudo virsh undefine node4-control || true
 sudo virsh undefine node2-compute || true
 sudo virsh undefine node5-compute || true
-sudo rm -rf  /var/lib/libvirt/images/opnfv-maas.img /var/lib/libvirt/images/bootstrap.img /var/lib/libvirt/images/node1-control.img /var/lib/libvirt/images/node3-control.img /var/lib/libvirt/images/node4-control.img /var/lib/libvirt/images/node2-compute.img /var/lib/libvirt/images/node5-compute.img || true
+sudo rm -rf  /var/lib/libvirt/images/node1-control.img /var/lib/libvirt/images/node2-compute.img /var/lib/libvirt/images/node3-control.img /var/lib/libvirt/images/node4-control.img /var/lib/libvirt/images/node5-compute.img || true
  
 echo " Cleanup Finished ..."

diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 0c0e83c..2c3294a 100644 (file)
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -206,11 +206,11 @@ openstack-phase2:
       to:
         - "nodes-api=0"
     odl-controller:
-      branch: lp:~openstack-charmers/charms/trusty/odl-controller/next
-      options:
-        #install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
-        install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distribution-karaf-0.3.3-Lithium-SR3.tar.gz"
-        profile: "openvswitch-odl-lithium"
+      branch: lp:~opnfv-team/charms/trusty/odl-controller/Be
+       options:
+        #install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distrib
+        install-url: "https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium-RC2
+        profile: "openvswitch-odl-Be"
         http-proxy: "http://squid.internal:3128"
         https-proxy: "http://squid.internal:3128"
       to:

diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index 81449d6..0d77417 100644 (file)
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -143,11 +143,11 @@ openstack-phase2:
       to:  
         - "nodes-api=0"
     odl-controller:
-      branch: lp:~openstack-charmers/charms/trusty/odl-controller/next
-      options:
-        #install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
-        install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distribution-karaf-0.3.3-Lithium-SR3.tar.gz"
-        profile: "openvswitch-odl-lithium"
+      branch: lp:~opnfv-team/charms/trusty/odl-controller/Be
+       options:
+        #install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distrib
+        install-url: "https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium-RC2
+        profile: "openvswitch-odl-Be"
         http-proxy: "http://squid.internal:3128"
         https-proxy: "http://squid.internal:3128"
       to:

diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index eaea777..bf08438 100644 (file)
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -144,11 +144,11 @@ openstack-phase2:
       to:
         - "nodes-api=0"
     odl-controller:
-      branch: lp:~openstack-charmers/charms/trusty/odl-controller/next
-      options:
-        #install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
-        install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distribution-karaf-0.3.3-Lithium-SR3.tar.gz"
-        profile: "openvswitch-odl-lithium"
+      branch: lp:~opnfv-team/charms/trusty/odl-controller/Be
+       options:
+        #install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distrib
+        install-url: "https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium-RC2
+        profile: "openvswitch-odl-Be"
         http-proxy: "http://squid.internal:3128"
         https-proxy: "http://squid.internal:3128"
       to: