From 3ff5b9114e07349bb4a4b5578394bd799950dcf6 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Sat, 7 Nov 2015 00:38:58 -0600 Subject: added ubuntu charm for local deployment charm to configure the network according to the labs. Change-Id: I103b6dc243f025a4916d1057c247d01ee8f175ee --- ci/odl/juju-deployer/ovs-odl-ha.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ci/odl/juju-deployer') 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 -- cgit 1.2.3-korg