summaryrefslogtreecommitdiffstats
path: root/ci/odl
diff options
context:
space:
mode:
Diffstat (limited to 'ci/odl')
-rwxr-xr-xci/odl/01-deploybundle.sh2
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml2
-rw-r--r--ci/odl/juju-deployer/ovs-odl-tip.yaml2
-rw-r--r--ci/odl/juju-deployer/ovs-odl.yaml4
4 files changed, 5 insertions, 5 deletions
diff --git a/ci/odl/01-deploybundle.sh b/ci/odl/01-deploybundle.sh
index 74c603b3..03bab193 100755
--- a/ci/odl/01-deploybundle.sh
+++ b/ci/odl/01-deploybundle.sh
@@ -68,7 +68,7 @@ case "$3" in
sed -i -- 's/local:trusty\/ubuntu-nodes-controller/cs:trusty\/ubuntu/g' ./bundles.yaml
sed -i -- 's/local:trusty\/ubuntu-nodes-compute/cs:trusty\/ubuntu/g' ./bundles.yaml
sed -i -- 's/10.4.1.1/192.168.122.1/g' ./bundles.yaml
-# sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml
+ sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/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 4b02f708..c2764678 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -201,7 +201,7 @@ openstack-phase2:
to:
- "nodes-api=0"
odl-controller:
- branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
+ 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/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.3.2-Lithium-SR2/distribution-karaf-0.3.2-Lithium-SR2.tar.gz"
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index ee626214..2d9a24ed 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -146,7 +146,7 @@ openstack-phase2:
to:
- "nodes-api=0"
odl-controller:
- branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
+ 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/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.3.2-Lithium-SR2/distribution-karaf-0.3.2-Lithium-SR2.tar.gz"
diff --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml
index e67929df..0e6d4192 100644
--- a/ci/odl/juju-deployer/ovs-odl.yaml
+++ b/ci/odl/juju-deployer/ovs-odl.yaml
@@ -144,10 +144,10 @@ openstack-phase2:
to:
- "nodes-api=0"
odl-controller:
- branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
+ 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/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.3.2-Lithium-SR2/distribution-karaf-0.3.2-Lithium-SR2.tar.gz"
+ #install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.3.2-Lithium-SR2/distribution-karaf-0.3.2-Lithium-SR2.tar.gz"
http-proxy: "http://squid.internal:3128"
https-proxy: "http://squid.internal:3128"