aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Skalski <mskalski@mirantis.com>2016-08-12 09:01:43 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-12 09:01:44 +0000
commit242641444b6f64ef7e1ca6399a77d080f74987d7 (patch)
treeafca674c9a5dd217e505e561f7e2c532e78b2174
parent935d133447feadd07dfb7905fbe47c949f79e53c (diff)
parent7014695308b7429e6364a4f73725d56cd72a7aa5 (diff)
Merge "KVM scenario updates"
-rw-r--r--deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml12
1 files changed, 5 insertions, 7 deletions
diff --git a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
index f9863d11e..828569bb7 100644
--- 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