From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Thu, 14 Apr 2016 17:00:59 +0000 (-0500)
Subject: added the SR1 OpenDayLight build for Beryllium.
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F03%2F12303%2F1;p=joid.git

added the SR1 OpenDayLight build for Beryllium.

Change-Id: I41885492861c6f624d0e81503a49b3daf20c415c
(cherry picked from commit bc117148a167ee908ddc46f2c0cffdeac7484919)
---

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 695cae52..c76dfcd7 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -90,13 +90,13 @@ case "$5" in
          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
+         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-Be-vpn"/g' ./bundles.yaml
+         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-Be-l3"/g' ./bundles.yaml
+         sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-beryllium-l3"/g' ./bundles.yaml
         ;;
 esac
 
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 0b3b93f3..6aebd487 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -207,10 +207,10 @@ openstack-phase2:
       to:
         - "nodes-api=0"
     odl-controller:
-      branch: lp:~opnfv-team/charms/trusty/odl-controller/Be
+      branch: lp:~openstack-charmers/charms/trusty/odl-controller/next
       options:
-        install-url: "https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium-RC2/distribution-karaf-0.4.0-Beryllium-RC2.tar.gz"
-        profile: "openvswitch-odl-Be"
+        install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.1-Beryllium-SR1/distribution-karaf-0.4.1-Beryllium-SR1.tar.gz"
+        profile: "openvswitch-odl-beryllium"
         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 26acec9f..85e4cbfa 100644
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -147,10 +147,10 @@ openstack-phase2:
       to:  
         - "nodes-api=0"
     odl-controller:
-      branch: lp:~opnfv-team/charms/trusty/odl-controller/Be
+      branch: lp:~openstack-charmers/charms/trusty/odl-controller/next
       options:
-        install-url: "https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium-RC2/distribution-karaf-0.4.0-Beryllium-RC2.tar.gz"
-        profile: "openvswitch-odl-Be"
+        install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.1-Beryllium-SR1/distribution-karaf-0.4.1-Beryllium-SR1.tar.gz"
+        profile: "openvswitch-odl-beryllium"
         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 1ef94467..938953d2 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -147,14 +147,14 @@ openstack-phase2:
       to:
         - "nodes-api=0"
     odl-controller:
-      branch: lp:~opnfv-team/charms/trusty/odl-controller/Be
+      branch: lp:~openstack-charmers/charms/trusty/odl-controller/next
       options:
-        install-url: "https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium-RC2/distribution-karaf-0.4.0-Beryllium-RC2.tar.gz"
-        profile: "openvswitch-odl-Be"
+        install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.1-Beryllium-SR1/distribution-karaf-0.4.1-Beryllium-SR1.tar.gz"
+        profile: "openvswitch-odl-beryllium"
         http-proxy: "http://squid.internal:3128"
         https-proxy: "http://squid.internal:3128"
       to:
-        - "lxc:nodes-api=1"
+        - "lxc:nodes-api=0"
     glance:
       branch: lp:~openstack-charmers/charms/trusty/glance/next
       num_units: 1