Fuel Config Reap + Additional Refactoring for Autodeployment

[genesis.git] / fuel / deploy / libvirt / conf / multinode / dea.yaml

diff --git a/fuel/deploy/libvirt/dea.yaml b/fuel/deploy/libvirt/conf/multinode/dea.yaml
similarity index 97%
rename from fuel/deploy/libvirt/dea.yaml
rename to fuel/deploy/libvirt/conf/multinode/dea.yaml
index 802293f..dfd8382 100644 (file)
--- a/fuel/deploy/libvirt/dea.yaml
+++ b/fuel/deploy/libvirt/conf/multinode/dea.yaml
@@ -3,34 +3,34 @@ title: Deployment Environment Adapter (DEA)
 version: 1.1
 created: Sat Apr 25 16:26:22 UTC 2015
 comment: Small libvirt setup
-environment_name: opnfv59-b
+environment_name: opnfv_virt
 environment_mode: multinode
 wanted_release: Juno on Ubuntu 12.04.4
 nodes:
 - id: 1
-  interfaces: interface1
-  transformations: controller1
-  role: controller
+  interfaces: interfaces_1
+  transformations: transformations_1
+  role: ceph-osd,controller
 - id: 2
-  interfaces: interface1
-  transformations: controller1
-  role: controller
+  interfaces: interfaces_1
+  transformations: transformations_2
+  role: ceph-osd,compute
 - id: 3
-  interfaces: interface1
-  transformations: controller1
-  role: controller
+  interfaces: interfaces_1
+  transformations: transformations_2
+  role: ceph-osd,compute
 - id: 4
-  interfaces: interface1
-  transformations: compute1
-  role: compute
+  interfaces: interfaces_1
+  transformations: transformations_2
+  role: ceph-osd,compute
 - id: 5
-  interfaces: interface1
-  transformations: compute1
-  role: compute
+  interfaces: interfaces_1
+  transformations: transformations_2
+  role: ceph-osd,compute
 - id: 6
-  interfaces: interface1
-  transformations: compute1
-  role: compute
+  interfaces: interfaces_1
+  transformations: transformations_2
+  role: ceph-osd,compute
 fuel:
   ADMIN_NETWORK:
     ipaddress: 10.20.0.2
@@ -43,12 +43,12 @@ fuel:
   FUEL_ACCESS:
     user: admin
     password: admin
-  HOSTNAME: opnfv59
+  HOSTNAME: opnfv_virt
   NTP1: 0.pool.ntp.org
   NTP2: 1.pool.ntp.org
   NTP3: 2.pool.ntp.org
 interfaces:
-  interface1:
+  interfaces_1:
     eth0:
     - fuelweb_admin
     - management
@@ -59,7 +59,7 @@ interfaces:
     eth3:
     - public
 transformations:
-  controller1:
+  transformations_1:
     - action: add-br
       name: br-eth0
     - action: add-port
@@ -126,7 +126,7 @@ transformations:
       bridges:
       - br-eth2
       - br-prv
-  compute1:
+  transformations_2:
     - action: add-br
       name: br-eth0
     - action: add-port
@@ -692,14 +692,14 @@ settings:
         restrictions:
         - settings:common.libvirt_type.value == 'vcenter'
         type: checkbox
-        value: false
+        value: true
         weight: 75
       images_ceph:
         description: Configures Glance to use the Ceph RBD backend to store images.
           If enabled, this option will prevent Swift from installing.
         label: Ceph RBD for images (Glance)
         type: checkbox
-        value: false
+        value: true
         weight: 30
       images_vcenter:
         description: Configures Glance to use the vCenter/ESXi backend to store images.
@@ -833,7 +833,7 @@ settings:
         - settings:storage.volumes_lvm.value == true or settings:common.libvirt_type.value
           == 'vcenter'
         type: checkbox
-        value: false
+        value: true
         weight: 20
       volumes_lvm:
         description: Requires at least one Storage - Cinder LVM node.
@@ -841,7 +841,7 @@ settings:
         restrictions:
         - settings:storage.volumes_ceph.value == true
         type: checkbox
-        value: true
+        value: false
         weight: 10
       volumes_vmdk:
         description: Configures Cinder to store volumes via VMware vCenter.
@@ -973,4 +973,4 @@ settings:
         label: username
         type: text
         value: admin
-        weight: 10
+        weight: 10
\ No newline at end of file