summaryrefslogtreecommitdiffstats
path: root/ci/odl
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-02-08 13:08:29 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2016-02-08 20:08:37 +0000
commitf51e156d5ee09316cf6c40dacc1101f04b5619ec (patch)
tree423dcaf3919310470e7c6fdf6a5f8a1ddf5b7ac5 /ci/odl
parent023001fa6a5a347e85d2c94a382bb0cc9a7dba31 (diff)
modified to include the ODL Be support with sfc.
Change-Id: I7b376bc5afb8700152e654defaa19eb4d1d8393a (cherry picked from commit 7524f897b4b43615c71ceb9853ab74b33d4ecdfb)
Diffstat (limited to 'ci/odl')
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml10
-rw-r--r--ci/odl/juju-deployer/ovs-odl-nonha.yaml10
-rw-r--r--ci/odl/juju-deployer/ovs-odl-tip.yaml10
3 files changed, 15 insertions, 15 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 0c0e83c3..2c3294a6 100644
--- 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 81449d61..0d774179 100644
--- 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 eaea7770..bf08438d 100644
--- 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: