KVM scenario updates

1. Install CEPH_OSD on 2 compute nodes
2. Delete default 'net_segment_type: tun' definition, for it
   is already defined in dea_base.yaml, and it can be updated
   by lab dea files
3. Update osd_pool_size from 1 to 2
4. Michal indicates that
https://review.openstack.org/#/c/342717/ set the limitation
: Restrict usage of controller and osd role on single host

Change-Id: I4907482391588fc21ecf60603b1c599413cbc531
Signed-off-by: Julien-zte <zhang.jun3g@zte.com.cn>

diff --git a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
index f9863d1..828569b 100644 (file)
--- a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
@@ -42,16 +42,14 @@ stack-extensions:
 # By editing the override-config sections below, you can override arbitrary
 # configuration name-space settings
 dea-override-config:
-  environment:
-    net_segment_type: tun
   nodes:
   - id: 1
     interfaces: interfaces_1
-    role: mongo,controller
+    role: controller,mongo
     transformations: transformations_1
   - id: 2
     interfaces: interfaces_1
-    role: controller,ceph-osd
+    role: controller
     transformations: transformations_1
   - id: 3
     interfaces: interfaces_1
@@ -59,11 +57,11 @@ dea-override-config:
     transformations: transformations_1
   - id: 4
     interfaces: interfaces_1
-    role: compute
+    role: compute,ceph-osd
     transformations: transformations_1
   - id: 5
     interfaces: interfaces_1
-    role: compute
+    role: compute,ceph-osd
     transformations: transformations_1
 
   settings:
@@ -121,7 +119,7 @@ dea-override-config:
             error: Invalid number
             source: ^[1-9]\d*$
           type: text
-          value: '1'
+          value: '2'
           weight: 85
         volumes_block_device:
           description: High performance block device storage. It is recommended to have at least one Storage - Cinder Block Device