summaryrefslogtreecommitdiffstats
path: root/ci/odl/juju-deployer
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2015-11-07 00:38:58 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2015-11-07 00:42:36 -0600
commit3ff5b9114e07349bb4a4b5578394bd799950dcf6 (patch)
treebf19af5d90f4a343218b8e260fa20638d2057357 /ci/odl/juju-deployer
parentebefaf35b2909bcc41d8ba3917228b7ccba7ce2e (diff)
added ubuntu charm for local deployment charm to configure the
network according to the labs. Change-Id: I103b6dc243f025a4916d1057c247d01ee8f175ee
Diffstat (limited to 'ci/odl/juju-deployer')
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml10
1 files changed, 5 insertions, 5 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 35372d68..27a10d6f 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -3,11 +3,11 @@ openstack-phase1:
series: trusty
services:
nodes-api:
- branch: "lp:charms/trusty/ubuntu"
+ charm: "local:trusty/ubuntu-nodes-controller"
num_units: 3
constraints: tags=control
nodes-compute:
- branch: "lp:charms/trusty/ubuntu"
+ charm: "local:trusty/ubuntu-nodes-compute"
num_units: 1
constraints: tags=compute
"ntp":
@@ -132,7 +132,7 @@ openstack-phase2:
# num_units: 3
# constraints: tags=gateway
options:
-# "ext-port": eth1
+# "ext-port": "eth1"
plugin: ovs-odl
# instance-mtu: 1400
to:
@@ -141,9 +141,9 @@ openstack-phase2:
branch: lp:~narindergupta/charms/trusty/odl-controller/liberty
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"
- # to: lxc:nodes-api=1
+# 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"
to:
- - "nodes-api=0"
+ - "lxc:nodes-api=1"
"glance":
charm: "cs:trusty/glance"
num_units: 3