diff options
author | 2016-04-14 12:00:59 -0500 | |
---|---|---|
committer | 2016-04-14 19:08:21 +0000 | |
commit | 78c15dfed4a0c983a87774a54eb2c98d0e49b3db (patch) | |
tree | 105f77863f1bef53b37f1f6582a31c5291f346a7 /ci/odl | |
parent | c752a0d51dafc54b6158a675cadfc9fd072431b7 (diff) |
added the SR1 OpenDayLight build for Beryllium.stable/brahmaputra
Change-Id: I41885492861c6f624d0e81503a49b3daf20c415c
(cherry picked from commit bc117148a167ee908ddc46f2c0cffdeac7484919)
Diffstat (limited to 'ci/odl')
-rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 6 | ||||
-rw-r--r-- | ci/odl/juju-deployer/ovs-odl-nonha.yaml | 6 | ||||
-rw-r--r-- | ci/odl/juju-deployer/ovs-odl-tip.yaml | 8 |
3 files changed, 10 insertions, 10 deletions
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 |