From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Tue, 12 Jan 2016 16:43:14 +0000 (-0600)
Subject: modified to reflect more oSD and single gateway.
X-Git-Tag: brahmaputra.1.0~78
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F67%2F6467%2F1;p=joid.git
modified to reflect more oSD and single gateway.
Change-Id: Ie12a953ef87cf19cbfe183392a8065039f484fa1
(cherry picked from commit efe44c2a1f492eaac6958244fdca7cd49cf10d43)
---
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