summaryrefslogtreecommitdiffstats
path: root/ci/odl
diff options
context:
space:
mode:
Diffstat (limited to 'ci/odl')
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml4
-rw-r--r--ci/odl/juju-deployer/ovs-odl-tip.yaml4
-rw-r--r--ci/odl/juju-deployer/ovs-odl.yaml5
3 files changed, 7 insertions, 6 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 6373f2d0..9ebf5fc2 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -7,10 +7,10 @@ openstack-services:
constraints: tags=physical
neutron-gateway:
branch: lp:~sdn-charmers/charms/trusty/neutron-gateway/ovs-odl
- constraints: tags=neutron
options:
plugin: ovs-odl
instance-mtu: 1400
+ to: ubuntu=0
nova-compute:
branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
num_units: 2
@@ -32,7 +32,7 @@ openstack-services:
odl-controller:
branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
options:
- install-url: "http://10.4.1.1/odl/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
+ 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"
to: lxc:ubuntu=0
openvswitch-odl:
branch: lp:~alai/charms/trusty/openvswitch-odl/trunk
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index 3c490d71..a5d1f08e 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -6,10 +6,10 @@ openstack-services:
constraints: tags=physical
neutron-gateway:
branch: lp:~sdn-charmers/charms/trusty/neutron-gateway/ovs-odl
- constraints: tags=neutron
options:
plugin: ovs-odl
instance-mtu: 1400
+ to: ubuntu=0
nova-compute:
branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
num_units: 2
@@ -31,7 +31,7 @@ openstack-services:
odl-controller:
branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
options:
- install-url: "http://10.4.1.1/odl/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
+ 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"
to: lxc:ubuntu=0
openvswitch-odl:
branch: lp:~alai/charms/trusty/openvswitch-odl/trunk
diff --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml
index 6373f2d0..dae7a36c 100644
--- a/ci/odl/juju-deployer/ovs-odl.yaml
+++ b/ci/odl/juju-deployer/ovs-odl.yaml
@@ -7,10 +7,11 @@ openstack-services:
constraints: tags=physical
neutron-gateway:
branch: lp:~sdn-charmers/charms/trusty/neutron-gateway/ovs-odl
- constraints: tags=neutron
+ #constraints: tags=neutron
options:
plugin: ovs-odl
instance-mtu: 1400
+ to: ubuntu=0
nova-compute:
branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
num_units: 2
@@ -32,7 +33,7 @@ openstack-services:
odl-controller:
branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
options:
- install-url: "http://10.4.1.1/odl/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
+ 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"
to: lxc:ubuntu=0
openvswitch-odl:
branch: lp:~alai/charms/trusty/openvswitch-odl/trunk