summaryrefslogtreecommitdiffstats
path: root/labs/ericsson/pod2/fuel
diff options
context:
space:
mode:
Diffstat (limited to 'labs/ericsson/pod2/fuel')
-rw-r--r--labs/ericsson/pod2/fuel/config/dea-pod-override.yaml159
-rw-r--r--labs/ericsson/pod2/fuel/config/dha.yaml18
2 files changed, 112 insertions, 65 deletions
diff --git a/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml b/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml
index 7b0e96a..1dbc825 100644
--- a/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml
+++ b/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml
@@ -1,19 +1,19 @@
dea-pod-override-config-metadata:
title: 'Deployment Environment Adapter POD override for Ericsson-1, POD-2'
# DEA API version supported
- version: '0.1'
- created: 'Mon Dec 28 2015'
- comment: 'None'
+ version: '0.2'
+ created: 'Jan 26 2016'
+ comment: 'Rebased for Fuel8'
environment:
- name: POD2-BM1-DEPLOY
+ name: FUEL-BM1-POD2
interfaces_1:
- eth1:
+ eno49:
- fuelweb_admin
- eth2:
+ ens1f0:
- public
- management
- storage
- eth3:
+ ens1f1:
- private
transformations_1:
transformations:
@@ -38,19 +38,55 @@ transformations_1:
name: br-mesh
- action: add-port
bridge: br-fw-admin
- name: eth0
+ name: eno49
- action: add-port
bridge: br-mgmt
- name: eth2.100
+ name: ens1f0.100
- action: add-port
bridge: br-storage
- name: eth2.200
+ name: ens1f0.200
- action: add-port
bridge: br-ex
- name: eth2.753
+ name: ens1f0.753
- action: add-port
bridge: br-mesh
- name: eth3.300
+ name: ens1f1.300
+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: eno49
+ - action: add-port
+ bridge: br-mgmt
+ name: ens1f0.100
+ - action: add-port
+ bridge: br-storage
+ name: ens1f0.200
+ - action: add-port
+ bridge: br-ex
+ name: ens1f0.753
+ - action: add-port
+ bridge: br-mesh
+ name: ens1f1.300
fuel:
ADMIN_NETWORK:
dhcp_pool_end: 10.20.0.254
@@ -60,6 +96,7 @@ fuel:
DNS_DOMAIN: opnfvericsson.ca
DNS_SEARCH: opnfvericsson.ca
DNS_UPSTREAM: 10.118.32.193
+ HOSTNAME: fuel-bm1-pod2
NTP1: 10.118.32.193
NTP2: ''
NTP3: ''
@@ -69,63 +106,27 @@ network:
configuration_template: null
dns_nameservers:
- 10.118.32.193
+ floating_name: admin_floating_net
floating_ranges:
- - - 10.118.101.132
- - 10.118.101.140
+ - - 10.118.101.191
+ - 10.118.101.200
gre_id_range:
- 2
- 65535
internal_cidr: 192.168.111.0/24
internal_gateway: 192.168.111.1
+ internal_name: admin_internal_net
net_l23_provider: ovs
segmentation_type: tun
vlan_range:
- 1000
- 1030
networks:
- - cidr: 192.168.10.0/24
- gateway: null
- ip_ranges:
- - - 192.168.10.1
- - 192.168.10.254
- meta:
- cidr: 192.168.0.0/24
- configurable: true
- map_priority: 2
- name: management
- notation: cidr
- render_addr_mask: internal
- render_type: cidr
- use_gateway: false
- vips:
- - haproxy
- - vrouter
- vlan_start: 101
- name: management
- vlan_start: 100
- - cidr: 192.168.30.0/24
- gateway: null
- ip_ranges:
- - - 192.168.30.1
- - 192.168.30.254
- meta:
- cidr: 192.168.2.0/24
- configurable: true
- map_priority: 2
- name: private
- notation: cidr
- render_addr_mask: null
- render_type: cidr
- seg_type: tun
- use_gateway: false
- vlan_start: 103
- name: private
- vlan_start: 300
- cidr: 10.118.101.0/24
gateway: 10.118.101.1
ip_ranges:
- - - 10.118.101.122
- - 10.118.101.131
+ - - 10.118.101.180
+ - 10.118.101.190
meta:
cidr: 172.16.0.0/24
configurable: true
@@ -162,6 +163,44 @@ network:
vlan_start: 102
name: storage
vlan_start: 200
+ - cidr: 192.168.10.0/24
+ gateway: null
+ ip_ranges:
+ - - 192.168.10.1
+ - 192.168.10.254
+ meta:
+ cidr: 192.168.0.0/24
+ configurable: true
+ map_priority: 2
+ name: management
+ notation: cidr
+ render_addr_mask: internal
+ render_type: cidr
+ use_gateway: false
+ vips:
+ - haproxy
+ - vrouter
+ vlan_start: 101
+ name: management
+ vlan_start: 100
+ - cidr: 192.168.30.0/24
+ gateway: null
+ ip_ranges:
+ - - 192.168.30.1
+ - 192.168.30.254
+ meta:
+ cidr: 192.168.2.0/24
+ configurable: true
+ map_priority: 2
+ name: private
+ notation: cidr
+ render_addr_mask: null
+ render_type: cidr
+ seg_type: tun
+ use_gateway: false
+ vlan_start: 103
+ name: private
+ vlan_start: 300
- cidr: 10.20.0.0/24
gateway: 10.20.0.2
ip_ranges:
@@ -190,12 +229,14 @@ settings:
value: 10.118.32.193
weight: 10
metadata:
+ group: network
label: Host OS DNS Servers
- weight: 90
+ weight: 30
external_ntp:
metadata:
+ group: network
label: Host OS NTP Servers
- weight: 100
+ weight: 40
ntp_list:
description: List of upstream NTP servers, separated by comma
label: NTP server list
@@ -207,7 +248,10 @@ settings:
weight: 10
syslog:
metadata:
+ enabled: false
+ group: logging
label: Syslog
+ toggleable: true
weight: 50
syslog_port:
description: Remote syslog port
@@ -221,6 +265,9 @@ settings:
syslog_server:
description: Remote syslog hostname
label: Hostname
+ regex:
+ error: Invalid hostname
+ source: ^[a-zA-Z\d]+[-\.\da-zA-Z]*$
type: text
value: ''
weight: 10
diff --git a/labs/ericsson/pod2/fuel/config/dha.yaml b/labs/ericsson/pod2/fuel/config/dha.yaml
index 408d221..f30d556 100644
--- a/labs/ericsson/pod2/fuel/config/dha.yaml
+++ b/labs/ericsson/pod2/fuel/config/dha.yaml
@@ -1,9 +1,9 @@
dha-pod-config-metadata:
title: Deployment Hardware Adapter (DHA) for Ericsson-1, POD-2
# DHA API version supported
- version: 0.0.1
- created: Dececember 29 2015
- comment: Config for Ericsson Montreal Lab 1, POD2
+ version: 0.0.2
+ created: Jan 26 2016
+ comment: Config for Ericsson Montreal Lab 1, POD2, Rebased for Fuel8
# Adapter to use for this definition
adapter: hp
@@ -14,27 +14,27 @@ adapter: hp
nodes:
- id: 1
- pxeMac: ec:b1:d7:a2:43:c8
+ pxeMac: ec:b1:d7:a1:bd:60
ipmiIp: 10.118.120.235
ipmiUser: opnfv
ipmiPass: E///@work2
- id: 2
- pxeMac: ec:b1:d7:a1:8b:d8
+ pxeMac: ec:b1:d7:a2:44:a0
ipmiIp: 10.118.120.236
ipmiUser: opnfv
ipmiPass: E///@work2
- id: 3
- pxeMac: ec:b1:d7:a2:44:88
+ pxeMac: ec:b1:d7:a2:43:c0
ipmiIp: 10.118.120.237
ipmiUser: opnfv
ipmiPass: E///@work2
- id: 4
- pxeMac: ec:b1:d7:a2:44:a8
+ pxeMac: ec:b1:d7:a2:44:80
ipmiIp: 10.118.120.238
ipmiUser: opnfv
ipmiPass: E///@work2
- id: 5
- pxeMac: ec:b1:d7:a1:bd:68
+ pxeMac: ec:b1:d7:a1:8b:d0
ipmiIp: 10.118.120.239
ipmiUser: opnfv
ipmiPass: E///@work2
@@ -46,6 +46,6 @@ nodes:
password: r00tme
disks:
- compute: 50G
+ compute: 100G
controller: 100G
fuel: 50G