diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-12 10:43:14 -0600 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-13 03:03:39 +0000 |
| commit | abde28e6724b2e77bbf88d09c60c8f815c0ef7ea (patch) | |
| tree | 7d746660a7d60e0e3e2f63eea69bff2721982ca3 | |
| parent | ecb77774ffa8baec5c8708d1114cf1b95841d2d1 (diff) | |
modified to reflect more oSD and single gateway.
Change-Id: Ie12a953ef87cf19cbfe183392a8065039f484fa1
(cherry picked from commit efe44c2a1f492eaac6958244fdca7cd49cf10d43)
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 8 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/contrail-ha.yaml | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 26871350..7cb624bb 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -100,21 +100,21 @@ openstack-phase2: - "nodes-compute=1" ceph-osd: charm: cs:trusty/ceph-osd - num_units: 1 + num_units: 3 options: osd-devices: /srv osd-reformat: 'yes' to: - "nodes-api=0" + - "nodes-api=1" + - "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/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml index a4494df3..6cc86bf6 100644 --- a/ci/opencontrail/juju-deployer/contrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml @@ -117,21 +117,21 @@ openstack-phase2: - "nodes-compute=1" ceph-osd: charm: cs:trusty/ceph-osd - num_units: 1 + num_units: 3 options: osd-devices: /srv osd-reformat: 'yes' to: - "nodes-api=0" + - "nodes-api=1" + - "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 |