summaryrefslogtreecommitdiffstats
path: root/ci/nosdn/juju-deployer
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-01-05 17:33:15 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2016-01-05 17:33:15 -0600
commitcd5a784e05ea84079ce8fdce9ccea95bbdedb7fe (patch)
tree7a868dc9a530cd28d6ac74677abf11ab03ba39f3 /ci/nosdn/juju-deployer
parent03732f8792e9b42cac50d23e8f8eccef170e327d (diff)
modified to include additonal server for intel pod5. Also modified
the deployment yamls to adust to actual pharos config now for HA mode deploymnt with 3 control and 2 compute nodes. Change-Id: I67676101527ab1ea2d50379c4472ec60bc391f88
Diffstat (limited to 'ci/nosdn/juju-deployer')
-rw-r--r--ci/nosdn/juju-deployer/ovs-ha.yaml15
1 files changed, 8 insertions, 7 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-ha.yaml b/ci/nosdn/juju-deployer/ovs-ha.yaml
index 357349f1..bb910240 100644
--- a/ci/nosdn/juju-deployer/ovs-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-ha.yaml
@@ -8,7 +8,7 @@ openstack-phase1:
constraints: tags=control
nodes-compute:
charm: "local:trusty/ubuntu-nodes-compute"
- num_units: 1
+ num_units: 2
constraints: tags=compute
"ntp":
charm: "cs:trusty/ntp"
@@ -31,7 +31,7 @@ openstack-phase2:
charm: cs:trusty/ceilometer-agent
ceph:
charm: cs:trusty/ceph
- num_units: 1
+ num_units: 2
options:
monitor-count: 1
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
@@ -42,6 +42,7 @@ openstack-phase2:
# ceph-public-network: 192.168.0.0/24
to:
- "nodes-compute=0"
+ - "nodes-compute=1"
ceph-osd:
charm: cs:trusty/ceph-osd
num_units: 3
@@ -150,7 +151,7 @@ openstack-phase2:
- "lxc:nodes-api=2"
nova-compute:
charm: cs:trusty/nova-compute
- num_units: 1
+ num_units: 2
options:
enable-live-migration: true
enable-resize: true
@@ -158,7 +159,7 @@ openstack-phase2:
migration-auth-type: ssh
to:
- "nodes-compute=0"
-# - "nodes-compute=1"
+ - "nodes-compute=1"
# - "nodes-api=0"
# - "nodes-api=1"
# - "nodes-api=2"
@@ -324,7 +325,7 @@ trusty-liberty:
source: "cloud:trusty-liberty"
"openstack-origin": "cloud:trusty-liberty"
series: trusty
- ceph-osd-replication-count: 1
+ ceph-osd-replication-count: 2
trusty-kilo-nodes:
inherits: openstack-phase1
@@ -340,7 +341,7 @@ trusty-kilo:
source: "cloud:trusty-kilo"
"openstack-origin": "cloud:trusty-kilo"
series: trusty
- ceph-osd-replication-count: 1
+ ceph-osd-replication-count: 2
trusty-juno-nodes:
inherits: openstack-phase1
@@ -356,5 +357,5 @@ trusty-juno:
source: "cloud:trusty-juno"
"openstack-origin": "cloud:trusty-juno"
series: trusty
- ceph-osd-replication-count: 1
+ ceph-osd-replication-count: 2