Autodeployer support for ODL Plugin installation + Fuel 6.1

[genesis.git] / fuel / deploy / templates / hardware_environment / old_conf / linux_foundation_lab / pod2 / ha / dea.yaml

diff --git a/fuel/deploy/baremetal/conf/linux_foundation_lab/pod2/ha/dea.yaml b/fuel/deploy/templates/hardware_environment/old_conf/linux_foundation_lab/pod2/ha/dea.yaml
similarity index 98%
rename from fuel/deploy/baremetal/conf/linux_foundation_lab/pod2/ha/dea.yaml
rename to fuel/deploy/templates/hardware_environment/old_conf/linux_foundation_lab/pod2/ha/dea.yaml
index 5a0f367..d7fba48 100644 (file)
--- a/fuel/deploy/baremetal/conf/linux_foundation_lab/pod2/ha/dea.yaml
+++ b/fuel/deploy/templates/hardware_environment/old_conf/linux_foundation_lab/pod2/ha/dea.yaml
@@ -3,8 +3,10 @@ title: Deployment Environment Adapter (DEA)
 version:
 created:
 comment: Config for LF POD2 - HA deployment with Ceph
-environment_name: opnfv
-environment_mode: ha
+environment:
+  name: opnfv_virt
+  mode: ha
+  net_segment_type: vlan
 wanted_release: Juno on Ubuntu 12.04.4
 nodes:
 - id: 1
@@ -27,6 +29,11 @@ nodes:
   interfaces: interfaces_1
   transformations: transformations_2
   role: ceph-osd,compute
+opnfv:
+  hosts:
+  - name:
+    address:
+    fqdn:
 fuel:
   ADMIN_NETWORK:
     ipaddress: 10.20.0.2
@@ -43,17 +50,16 @@ fuel:
   NTP1: 0.pool.ntp.org
   NTP2: 1.pool.ntp.org
   NTP3: 2.pool.ntp.org
-interfaces:
-  interfaces_1:
-    eth0:
-    - public
-    eth1:
-    - fuelweb_admin
-    - management
-    - storage
-    - private
-transformations:
-  transformations_1:
+interfaces_1:
+  eth0:
+  - public
+  eth1:
+  - fuelweb_admin
+  - management
+  - storage
+  - private
+transformations_1:
+  transformations:
     - action: add-br
       name: br-eth0
     - action: add-port
@@ -110,7 +116,8 @@ transformations:
       bridges:
       - br-eth1
       - br-prv
-  transformations_2:
+transformations_2:
+  transformations:
     - action: add-br
       name: br-eth0
     - action: add-port
@@ -159,9 +166,6 @@ transformations:
       bridges:
       - br-eth1
       - br-prv
-opnfv:
-  compute: {}
-  controller: {}
 network:
   networking_parameters:
     base_mac: fa:16:3e:00:00:00