summaryrefslogtreecommitdiffstats
path: root/ci/onos/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/onos/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/onos/juju-deployer')
-rw-r--r--ci/onos/juju-deployer/onos-ha.yaml58
1 files changed, 35 insertions, 23 deletions
diff --git a/ci/onos/juju-deployer/onos-ha.yaml b/ci/onos/juju-deployer/onos-ha.yaml
index 5b3d7954..ceaaa175 100644
--- a/ci/onos/juju-deployer/onos-ha.yaml
+++ b/ci/onos/juju-deployer/onos-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"
@@ -86,7 +86,7 @@ openstack-phase2:
- "lxc:nodes-api=0"
ceph:
charm: cs:trusty/ceph
- num_units: 1
+ num_units: 2
options:
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
@@ -97,22 +97,27 @@ 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: 1
-# options:
-# osd-devices: /dev/sdb
-# osd-reformat: 'yes'
-# to:
-# - "lxc:nodes-api=0"
-# ceph-radosgw:
-# charm: cs:trusty/ceph-radosgw
-# num_units: 1
-# options:
-# use-embedded-webserver: true
-# to:
-# - "lxc:nodes-api=0"
+ - "nodes-compute=1"
+ ceph-osd:
+ charm: cs:trusty/ceph-osd
+ 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
+ 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
@@ -158,13 +163,13 @@ openstack-phase2:
- "lxc:nodes-api=2"
"nova-compute":
branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
- num_units: 1
+ num_units: 2
options:
"enable-live-migration": False
"manage-neutron-plugin-legacy-mode": False
to:
- "nodes-compute=0"
-# - "nodes-compute=1"
+ - "nodes-compute=1"
# - "nodes-api=0"
# - "nodes-api=1"
# - "nodes-api=2"
@@ -318,6 +323,13 @@ openstack-phase2:
- "cinder-ceph:ceph"
- - "ceph:client"
- "glance:ceph"
+ - - "ceph-osd:mon"
+ - "ceph:osd"
+ - - "ceph-radosgw:mon"
+ - "ceph:radosgw"
+ - - "ceph-radosgw:identity-service"
+ - "keystone:identity-service"
+
trusty-liberty-nodes:
inherits: openstack-phase1
overrides:
@@ -333,7 +345,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
@@ -350,7 +362,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:
@@ -368,6 +380,6 @@ trusty-juno:
source: "cloud:trusty-juno"
"openstack-origin": "cloud:trusty-juno"
series: trusty
- ceph-osd-replication-count: 1
+ ceph-osd-replication-count: 2