From cd5a784e05ea84079ce8fdce9ccea95bbdedb7fe Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Tue, 5 Jan 2016 17:33:15 -0600
Subject: 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
---
 ci/opencontrail/juju-deployer/contrail-ha.yaml | 55 +++++++++++++++-----------
 1 file changed, 32 insertions(+), 23 deletions(-)

(limited to 'ci/opencontrail')

diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml
index 686ba847..3183c614 100644
--- a/ci/opencontrail/juju-deployer/contrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-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"
@@ -103,7 +103,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==
@@ -114,22 +114,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
@@ -174,13 +179,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"
@@ -259,6 +264,10 @@ openstack-phase2:
     - [ "cinder:shared-db", "percona-cluster:shared-db" ]
     - [ "ceph:client", "cinder-ceph:ceph" ]
     - [ "ceph:client", "glance:ceph" ]
+    - [ "ceph-osd:mon", "ceph:osd" ]
+    - [ "ceph-radosgw:mon", "ceph:radosgw" ]
+    - [ "ceph-radosgw:identity-service", "keystone:identity-service" ]
+
 contrail:
   inherits: openstack-phase2
   services:
@@ -347,7 +356,7 @@ trusty-liberty:
     region: Canonical
     openstack-origin: cloud:trusty-liberty
     source: "cloud:trusty-liberty"
-    ceph-osd-replication-count: 1
+    ceph-osd-replication-count: 2
 
 trusty-kilo-nodes:
   inherits: openstack-phase1
@@ -365,7 +374,7 @@ trusty-kilo:
     region: Canonical
     openstack-origin: cloud:trusty-kilo
     source: "cloud:trusty-kilo"
-    ceph-osd-replication-count: 1
+    ceph-osd-replication-count: 2
 
 trusty-juno-nodes:
   inherits: openstack-phase1
@@ -382,6 +391,6 @@ trusty-juno:
     region: Canonical
     openstack-origin: cloud:trusty-juno
     source: "cloud:trusty-juno"
-    ceph-osd-replication-count: 1
+    ceph-osd-replication-count: 2
 
 
-- 
cgit 1.2.3-korg