Code Review
/
genesis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
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
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
comment: Small libvirt setup
# Adapter to use for this definition
@@
-13,30
+13,26
@@
adapter: libvirt
nodes:
- id: 1
libvirtName: controller1
nodes:
- id: 1
libvirtName: controller1
- libvirtTemplate:
libvir
t/vms/controller.xml
+ libvirtTemplate:
templates/virtual_environmen
t/vms/controller.xml
- id: 2
libvirtName: compute1
- id: 2
libvirtName: compute1
- libvirtTemplate:
libvir
t/vms/compute.xml
+ libvirtTemplate:
templates/virtual_environmen
t/vms/compute.xml
- id: 3
libvirtName: compute2
- id: 3
libvirtName: compute2
- libvirtTemplate:
libvir
t/vms/compute.xml
+ libvirtTemplate:
templates/virtual_environmen
t/vms/compute.xml
- id: 4
libvirtName: compute3
- id: 4
libvirtName: compute3
- libvirtTemplate:
libvir
t/vms/compute.xml
+ libvirtTemplate:
templates/virtual_environmen
t/vms/compute.xml
- id: 5
- id: 5
- libvirtName: compute4
- libvirtTemplate: libvirt/vms/compute.xml
-- id: 6
- libvirtName: compute5
- libvirtTemplate: libvirt/vms/compute.xml
-- id: 7
libvirtName: fuel-master
libvirtName: fuel-master
- libvirtTemplate:
libvir
t/vms/fuel.xml
+ libvirtTemplate:
templates/virtual_environmen
t/vms/fuel.xml
isFuel: yes
username: root
password: r00tme
isFuel: yes
username: root
password: r00tme
+virtNetConfDir: templates/virtual_environment/networks
+
disks:
disks:
- fuel:
3
0G
+ fuel:
5
0G
controller: 30G
compute: 30G
controller: 30G
compute: 30G