From bc117148a167ee908ddc46f2c0cffdeac7484919 Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Thu, 14 Apr 2016 12:00:59 -0500
Subject: [PATCH] added the SR1 OpenDayLight build for Beryllium.
Change-Id: I41885492861c6f624d0e81503a49b3daf20c415c
---
ci/01-deploybundle.sh | 6 +++---
ci/odl/juju-deployer/ovs-odl-ha.yaml | 6 +++---
ci/odl/juju-deployer/ovs-odl-nonha.yaml | 6 +++---
ci/odl/juju-deployer/ovs-odl-tip.yaml | 8 ++++----
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 356156dd..79535efb 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -92,13 +92,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 d55bd674..fab94767 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -223,10 +223,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
--
2.16.6