diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-11 18:06:18 -0600 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-12 05:47:17 +0000 |
| commit | 6434a0cec7309d16ca220c19a395a92caf143ac7 (patch) | |
| tree | 283af3c360bad408ca35f1e33f67dffad87c7200 /ci/nosdn/juju-deployer | |
| parent | 07b35e22299c8e0cd5c39340b05420a1109b6268 (diff) | |
ymodified to include the changes needed for MAAS 1.9
Change-Id: Ia7638dda099342bb65b89cddb90813a66aa53d08
(cherry picked from commit f27f64a537b51c35979cef258e933fad5330fc52)
Diffstat (limited to 'ci/nosdn/juju-deployer')
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-ha.yaml | 8 | ||||
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-tip.yaml | 4 | ||||
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs.yaml | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-ha.yaml b/ci/nosdn/juju-deployer/ovs-ha.yaml index 917cfc3c..cd0fc740 100644 --- a/ci/nosdn/juju-deployer/ovs-ha.yaml +++ b/ci/nosdn/juju-deployer/ovs-ha.yaml @@ -3,11 +3,11 @@ openstack-phase1: series: trusty services: nodes-api: - charm: "local:trusty/ubuntu-nodes-controller" + charm: "cs:trusty/ubuntu" num_units: 3 constraints: tags=control nodes-compute: - charm: "local:trusty/ubuntu-nodes-compute" + charm: "cs:trusty/ubuntu" num_units: 2 constraints: tags=compute "ntp": @@ -55,13 +55,11 @@ openstack-phase2: - "nodes-api=2" ceph-radosgw: charm: cs:trusty/ceph-radosgw - num_units: 3 + num_units: 1 options: use-embedded-webserver: true to: - "lxc:nodes-api=0" - - "lxc:nodes-api=1" - - "lxc:nodes-api=2" cinder: charm: cs:trusty/cinder num_units: 3 diff --git a/ci/nosdn/juju-deployer/ovs-tip.yaml b/ci/nosdn/juju-deployer/ovs-tip.yaml index b78128c5..e291a7a8 100644 --- a/ci/nosdn/juju-deployer/ovs-tip.yaml +++ b/ci/nosdn/juju-deployer/ovs-tip.yaml @@ -3,11 +3,11 @@ openstack-phase1: series: trusty services: nodes-api: - charm: "local:trusty/ubuntu-nodes-controller" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=control nodes-compute: - charm: "local:trusty/ubuntu-nodes-compute" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=compute "ntp": diff --git a/ci/nosdn/juju-deployer/ovs.yaml b/ci/nosdn/juju-deployer/ovs.yaml index 4f305695..6d52a486 100644 --- a/ci/nosdn/juju-deployer/ovs.yaml +++ b/ci/nosdn/juju-deployer/ovs.yaml @@ -3,11 +3,11 @@ openstack-phase1: series: trusty services: nodes-api: - charm: "local:trusty/ubuntu-nodes-controller" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=control nodes-compute: - charm: "local:trusty/ubuntu-nodes-compute" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=compute "ntp": |