aboutsummaryrefslogtreecommitdiffstats
path: root/labs
diff options
context:
space:
mode:
Diffstat (limited to 'labs')
-rw-r--r--labs/arm/pod2/fuel/config/dea-pod-override.yaml68
-rw-r--r--labs/arm/pod2/fuel/config/dha.yaml16
2 files changed, 21 insertions, 63 deletions
diff --git a/labs/arm/pod2/fuel/config/dea-pod-override.yaml b/labs/arm/pod2/fuel/config/dea-pod-override.yaml
index d908460..c303a73 100644
--- a/labs/arm/pod2/fuel/config/dea-pod-override.yaml
+++ b/labs/arm/pod2/fuel/config/dea-pod-override.yaml
@@ -30,14 +30,6 @@ fuel:
NTP2: 1.pool.ntp.org
NTP3: 2.pool.ntp.org
interfaces_1:
- enm2p1s0f1:
- - fuelweb_admin
- - storage
- enm6p1s0f1:
- - public
- - management
- - private
-interfaces_2:
ene18:
- fuelweb_admin
ene25:
@@ -45,7 +37,7 @@ interfaces_2:
- management
- storage
- private
-interfaces_3:
+interfaces_2:
ene10:
- public
- management
@@ -75,42 +67,6 @@ transformations_1:
- action: add-br
name: br-mesh
- action: add-port
- bridge: br-storage
- name: enm2p1s0f1.2010
- - action: add-port
- bridge: br-ex
- name: enm6p1s0f1
- - action: add-port
- bridge: br-mgmt
- name: enm6p1s0f1.2011
- - action: add-port
- bridge: br-mesh
- name: enm6p1s0f1.2012
- - action: add-port
- bridge: br-fw-admin
- name: enm2p1s0f1
-transformations_2:
- transformations:
- - action: add-br
- name: br-fw-admin
- - action: add-br
- name: br-mgmt
- - action: add-br
- name: br-storage
- - action: add-br
- name: br-ex
- - action: add-br
- name: br-floating
- provider: ovs
- - action: add-patch
- bridges:
- - br-floating
- - br-ex
- mtu: 65000
- provider: ovs
- - action: add-br
- name: br-mesh
- - action: add-port
bridge: br-fw-admin
name: ene18
- action: add-port
@@ -125,7 +81,7 @@ transformations_2:
- action: add-port
bridge: br-mesh
name: ene25.2012
-transformations_3:
+transformations_2:
transformations:
- action: add-br
name: br-fw-admin
@@ -280,24 +236,24 @@ network:
vlan_start: null
nodes:
- id: 1
- interfaces: interfaces_3
- role: controller,mongo,opendaylight
- transformations: transformations_3
+ interfaces: interfaces_2
+ role: ceph-osd,compute
+ transformations: transformations_2
- id: 2
- interfaces: interfaces_3
- role: controller
- transformations: transformations_3
-- id: 3
interfaces: interfaces_2
- role: ceph-osd,controller
+ role: ceph-osd,compute
transformations: transformations_2
+- id: 3
+ interfaces: interfaces_1
+ role: controller,mongo
+ transformations: transformations_1
- id: 4
interfaces: interfaces_1
- role: ceph-osd,compute
+ role: controller,opendaylight
transformations: transformations_1
- id: 5
interfaces: interfaces_1
- role: ceph-osd,compute
+ role: ceph-osd,controller
transformations: transformations_1
settings:
editable:
diff --git a/labs/arm/pod2/fuel/config/dha.yaml b/labs/arm/pod2/fuel/config/dha.yaml
index db5d583..b7b0d42 100644
--- a/labs/arm/pod2/fuel/config/dha.yaml
+++ b/labs/arm/pod2/fuel/config/dha.yaml
@@ -1,8 +1,8 @@
dha-pod-config-metadata:
- title: Deployment Hardware Adapter (DHA)
# DHA API version supported
- version: 0.0.3
- created: Mon Jun 13 14:28:57 2016
+ version: 1.1
+ created: Sat Feb 4 15:47:15 2017
+ comment: None
comment: Enea Armband arm-pod2 DHA (mixed vendors)
# Adapter to use for this definition
@@ -57,19 +57,21 @@ nodes:
libvirtTemplate: null
pxeMac: 00:01:73:02:36:d5
- id: 4
- ipmiIp: 10.0.2.2
+ ipmiIp: 127.0.0.1
ipmiPass: admin
ipmiUser: admin
+ ipmiPort: 677
libvirtName: null
libvirtTemplate: null
- pxeMac: 00:0f:b7:08:00:c0
+ pxeMac: 00:01:73:02:3b:1d
- id: 5
- ipmiIp: 10.0.2.3
+ ipmiIp: 127.0.0.1
ipmiPass: admin
ipmiUser: admin
+ ipmiPort: 676
libvirtName: null
libvirtTemplate: null
- pxeMac: 00:0f:b7:09:01:c0
+ pxeMac: 00:01:73:02:3b:41
# Adding the Fuel node as node id 6
# which may not be correct - please adjust as needed.
- id: 6