Autodeployer support for ODL Plugin installation + Fuel 6.1

[genesis.git] / fuel / deploy / templates / virtual_environment / conf / ha / dha.yaml

diff --git a/fuel/deploy/libvirt/conf/multinode/dha.yaml b/fuel/deploy/templates/virtual_environment/conf/ha/dha.yaml
similarity index 54%
rename from fuel/deploy/libvirt/conf/multinode/dha.yaml
rename to fuel/deploy/templates/virtual_environment/conf/ha/dha.yaml
index d862f64..224e9bd 100644 (file)
--- a/fuel/deploy/libvirt/conf/multinode/dha.yaml
+++ b/fuel/deploy/templates/virtual_environment/conf/ha/dha.yaml
@@ -1,7 +1,7 @@
 title: Deployment Hardware Adapter (DHA)
 # DHA API version supported
-version: 1.1
-created: Sat Apr 25 16:26:22 UTC 2015
+version:
+created:
 comment: Small libvirt setup
 
 # Adapter to use for this definition
@@ -13,30 +13,26 @@ adapter: libvirt
 nodes:
 - id: 1
   libvirtName: controller1
-  libvirtTemplate: libvirt/vms/controller.xml
+  libvirtTemplate: templates/virtual_environment/vms/controller.xml
 - id: 2
   libvirtName: compute1
-  libvirtTemplate: libvirt/vms/compute.xml
+  libvirtTemplate: templates/virtual_environment/vms/compute.xml
 - id: 3
   libvirtName: compute2
-  libvirtTemplate: libvirt/vms/compute.xml
+  libvirtTemplate: templates/virtual_environment/vms/compute.xml
 - id: 4
   libvirtName: compute3
-  libvirtTemplate: libvirt/vms/compute.xml
+  libvirtTemplate: templates/virtual_environment/vms/compute.xml
 - id: 5
-  libvirtName: compute4
-  libvirtTemplate: libvirt/vms/compute.xml
-- id: 6
-  libvirtName: compute5
-  libvirtTemplate: libvirt/vms/compute.xml
-- id: 7
   libvirtName: fuel-master
-  libvirtTemplate: libvirt/vms/fuel.xml
+  libvirtTemplate: templates/virtual_environment/vms/fuel.xml
   isFuel: yes
   username: root
   password: r00tme
 
+virtNetConfDir: templates/virtual_environment/networks
+
 disks:
-  fuel: 30G
+  fuel: 50G
   controller: 30G
   compute: 30G