Fuel Config Reap + Additional Refactoring for Autodeployment

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

diff --git a/fuel/deploy/baremetal/dea.yaml b/fuel/deploy/baremetal/conf/ericsson_montreal_lab/multinode/dea.yaml
similarity index 96%
rename from fuel/deploy/baremetal/dea.yaml
rename to fuel/deploy/baremetal/conf/ericsson_montreal_lab/multinode/dea.yaml
index eb3019c..328dd6b 100644 (file)
--- a/fuel/deploy/baremetal/dea.yaml
+++ b/fuel/deploy/baremetal/conf/ericsson_montreal_lab/multinode/dea.yaml
@@ -8,13 +8,29 @@ 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: compute1
-  role: compute
+  interfaces: interfaces_1
+  transformations: transformations_2
+  role: ceph-osd,compute
+- id: 3
+  interfaces: interfaces_1
+  transformations: transformations_2
+  role: ceph-osd,compute
+- id: 4
+  interfaces: interfaces_1
+  transformations: transformations_2
+  role: ceph-osd,compute
+- id: 5
+  interfaces: interfaces_1
+  transformations: transformations_2
+  role: ceph-osd,compute
+- id: 6
+  interfaces: interfaces_1
+  transformations: transformations_2
+  role: ceph-osd,compute
 fuel:
   ADMIN_NETWORK:
     ipaddress: 10.40.0.2
@@ -28,11 +44,11 @@ fuel:
     user: admin
     password: admin
   HOSTNAME: opnfv
-  NTP1: 0.ca.pool.ntp.org
-  NTP2: 1.ca.pool.ntp.org
-  NTP3: 2.ca.pool.ntp.org
+  NTP1: 10.118.34.219
+  NTP2:
+  NTP3:
 interfaces:
-  interface1:
+  interfaces_1:
     eth0:
     - fuelweb_admin
     eth2:
@@ -41,7 +57,7 @@ interfaces:
     - storage
     - private
 transformations:
-  controller1:
+  transformations_1:
     - action: add-br
       name: br-eth0
     - action: add-port
@@ -80,6 +96,8 @@ transformations:
       name: br-storage
     - action: add-br
       name: br-fw-admin
+    - action: add-br
+      name: br-prv
     - action: add-patch
       bridges:
       - br-eth2
@@ -104,25 +122,15 @@ transformations:
       bridges:
       - br-eth0
       - br-fw-admin
-      trunks:
-      - 0
     - action: add-patch
       bridges:
       - br-eth2
       - br-ex
-      tags:
-      - 120
-      - 0
-      vlan_ids:
-      - 120
-      - 0
-    - action: add-br
-      name: br-prv
     - action: add-patch
       bridges:
       - br-eth2
       - br-prv
-  compute1:
+  transformations_2:
     - action: add-br
       name: br-eth0
     - action: add-port
@@ -159,6 +167,8 @@ transformations:
       name: br-storage
     - action: add-br
       name: br-fw-admin
+    - action: add-br
+      name: br-prv
     - action: add-patch
       bridges:
       - br-eth2
@@ -183,10 +193,6 @@ transformations:
       bridges:
       - br-eth0
       - br-fw-admin
-      trunks:
-      - 0
-    - action: add-br
-      name: br-prv
     - action: add-patch
       bridges:
       - br-eth2
@@ -199,10 +205,9 @@ network:
     base_mac: fa:16:3e:00:00:00
     dns_nameservers:
     - 10.118.32.193
-    - 8.8.8.8
     floating_ranges:
-    - - 172.16.0.130
-      - 172.16.0.254
+    - - 10.118.36.48
+      - 10.118.36.62
     gre_id_range:
     - 2
     - 65535
@@ -214,11 +219,11 @@ network:
     - 2022
     - 2023
   networks:
-  - cidr: 172.16.0.0/24
-    gateway: 172.16.0.1
+  - cidr: 10.118.36.32/27
+    gateway: 10.118.36.1
     ip_ranges:
-    - - 172.16.0.2
-      - 172.16.0.126
+    - - 10.118.36.33
+      - 10.118.36.47
     meta:
       assign_vip: true
       cidr: 172.16.0.0/24
@@ -235,7 +240,7 @@ network:
       use_gateway: true
       vlan_start: null
     name: public
-    vlan_start: 120
+    vlan_start: null
   - cidr: 192.168.0.0/24
     gateway: null
     ip_ranges:
@@ -251,7 +256,7 @@ network:
       render_addr_mask: internal
       render_type: cidr
       use_gateway: false
-      vlan_start: 101
+      vlan_start: 320
     name: management
     vlan_start: 320
   - cidr: 192.168.1.0/24
@@ -269,7 +274,7 @@ network:
       render_addr_mask: storage
       render_type: cidr
       use_gateway: false
-      vlan_start: 102
+      vlan_start: 220
     name: storage
     vlan_start: 220
   - cidr: null
@@ -501,7 +506,7 @@ settings:
         description: List of upstream DNS servers, separated by comma
         label: DNS list
         type: text
-        value: 10.118.32.193, 8.8.8.8
+        value: 10.118.32.193
         weight: 10
       metadata:
         label: Upstream DNS
@@ -514,7 +519,7 @@ settings:
         description: List of upstream NTP servers, separated by comma
         label: NTP servers list
         type: text
-        value: 0.pool.ntp.org, 1.pool.ntp.org
+        value: 10.118.34.219
         weight: 10
     kernel_params:
       kernel:
@@ -604,7 +609,7 @@ settings:
         weight: 20
       nsx_controllers:
         description: One or more IPv4[:port] addresses of NSX controller node, separated
-          by comma (e.g. 10.40.30.2,192.168.110.254:443)
+          by comma (e.g. 10.30.30.2,192.168.110.254:443)
         label: NSX controller endpoint
         regex:
           error: Invalid controller endpoints, specify valid IPv4[:port] pair
@@ -698,14 +703,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.
@@ -839,7 +844,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.
@@ -979,4 +984,4 @@ settings:
         label: username
         type: text
         value: admin
-        weight: 10
+        weight: 10
\ No newline at end of file