Merge "KVMFORNFV: Implementing kvmfornfv Scenarios."

[fuel.git] / deploy / scenario / ha_nfv-kvm_heat_ceilometer_scenario.yaml

diff --git a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
index 2941a72..8ced66d 100644 (file)
--- a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
@@ -22,8 +22,8 @@
 # deployment configuration meta-data
 deployment-scenario-metadata:
    title: NFV KVM HA deployment
-   version: 0.0.5
-   created: Mar 18 2016
+   version: 0.0.6
+   created: 27.07.2016
    comment: Ceph cannot be assigned to compute, ceph is collocated with one of the controllers
 
 ##############################################################################
@@ -32,9 +32,9 @@ deployment-scenario-metadata:
 # <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
 # It does so by copying the config file to the local plugin config directory
 stack-extensions:
-   - module: fuel-plugin-qemu
+   - module: fuel-plugin-kvm
      module-config-name: fuel-nfvkvm
-     module-config-version: 0.0.2
+     module-config-version: 1.0.0
      module-config-override:
        # Module config overrides
 
@@ -42,29 +42,22 @@ 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
-    transformations: transformations_1
+    role: controller,mongo
   - id: 2
     interfaces: interfaces_1
-    role: controller,ceph-osd
-    transformations: transformations_1
+    role: controller
   - id: 3
     interfaces: interfaces_1
     role: controller
-    transformations: transformations_1
   - id: 4
     interfaces: interfaces_1
-    role: compute
-    transformations: transformations_1
+    role: compute,ceph-osd
   - id: 5
     interfaces: interfaces_1
-    role: compute
-    transformations: transformations_1
+    role: compute,ceph-osd
 
   settings:
     editable:
@@ -121,7 +114,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