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
/
hardware_environment
/
old_conf
/
ericsson_montreal_lab
/
ha
/
dea.yaml
diff --git
a/fuel/deploy/baremetal/conf/ericsson_montreal_lab/ha/dea.yaml
b/fuel/deploy/templates/hardware_environment/old_conf/ericsson_montreal_lab/ha/dea.yaml
similarity index 98%
rename from
fuel/deploy/baremetal/conf/ericsson_montreal_lab/ha/dea.yaml
rename to
fuel/deploy/templates/hardware_environment/old_conf/ericsson_montreal_lab/ha/dea.yaml
index
dc8014d
..
6ea3b72
100644
(file)
--- a/
fuel/deploy/baremetal/conf/ericsson_montreal_lab/ha/dea.yaml
+++ b/
fuel/deploy/templates/hardware_environment/old_conf/ericsson_montreal_lab/ha/dea.yaml
@@
-1,10
+1,12
@@
title: Deployment Environment Adapter (DEA)
# DEA API version supported
title: Deployment Environment Adapter (DEA)
# DEA API version supported
-version:
1.1
-created:
Tue May 5 15:33:07 UTC 2015
+version:
+created:
comment: Test environment Ericsson Montreal
comment: Test environment Ericsson Montreal
-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
wanted_release: Juno on Ubuntu 12.04.4
nodes:
- id: 1
@@
-31,6
+33,11
@@
nodes:
interfaces: interfaces_1
transformations: transformations_2
role: ceph-osd,compute
interfaces: interfaces_1
transformations: transformations_2
role: ceph-osd,compute
+opnfv:
+ hosts:
+ - name:
+ address:
+ fqdn:
fuel:
ADMIN_NETWORK:
ipaddress: 10.40.0.2
fuel:
ADMIN_NETWORK:
ipaddress: 10.40.0.2
@@
-47,17
+54,16
@@
fuel:
NTP1: 10.118.34.219
NTP2:
NTP3:
NTP1: 10.118.34.219
NTP2:
NTP3:
-interfaces:
- interfaces_1:
- eth0:
- - fuelweb_admin
- eth2:
- - public
- - management
- - storage
- - private
-transformations:
- transformations_1:
+interfaces_1:
+ eth0:
+ - fuelweb_admin
+ eth2:
+ - public
+ - management
+ - storage
+ - private
+transformations_1:
+ transformations:
- action: add-br
name: br-eth0
- action: add-port
- action: add-br
name: br-eth0
- action: add-port
@@
-136,7
+142,8
@@
transformations:
bridges:
- br-eth2
- br-prv
bridges:
- br-eth2
- br-prv
- transformations_2:
+transformations_2:
+ transformations:
- action: add-br
name: br-eth0
- action: add-port
- action: add-br
name: br-eth0
- action: add-port
@@
-203,9
+210,6
@@
transformations:
bridges:
- br-eth2
- br-prv
bridges:
- br-eth2
- br-prv
-opnfv:
- compute: {}
- controller: {}
network:
networking_parameters:
base_mac: fa:16:3e:00:00:00
network:
networking_parameters:
base_mac: fa:16:3e:00:00:00