aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan K. Berg <stefan.k.berg@ericsson.com>2016-03-06 16:54:37 +0100
committerStefan Berg <stefan.k.berg@ericsson.com>2016-03-07 06:54:47 +0000
commiteba21383c49be75f3bcdb75dac87b67608c9dde6 (patch)
treeb545df19c5d5476792450c8f79c9a186284abe6f
parent73d1d0ac7e43ee86181bbeb29e7148ffc3ea515d (diff)
Updated Ericsson pod1 configstable/brahmaputra
Change-Id: I53a6e4a2beed2f9ae08623fc3b094172b861d7db Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com> (cherry picked from commit 0712bbd2537dca66437c3356ac9a7e0c3257c31b)
-rw-r--r--labs/ericsson/pod1/fuel/config/dea-pod-override.yaml79
1 files changed, 37 insertions, 42 deletions
diff --git a/labs/ericsson/pod1/fuel/config/dea-pod-override.yaml b/labs/ericsson/pod1/fuel/config/dea-pod-override.yaml
index 713f1cc..477e769 100644
--- a/labs/ericsson/pod1/fuel/config/dea-pod-override.yaml
+++ b/labs/ericsson/pod1/fuel/config/dea-pod-override.yaml
@@ -1,14 +1,14 @@
dea-pod-override-config-metadata:
title: 'Deployment Environment Adapter POD override for Ericsson, POD1'
version: '0.1'
- created: 'Tue Jan 12 2016'
+ created: 'Fri Mar 4 2016'
comment: 'None'
environment:
- name: ystick
+ name: FUEL-BM-POD1
interfaces_1:
- eth0:
+ eno1:
- fuelweb_admin
- eth2:
+ ens1f0:
- public
- management
- storage
@@ -33,31 +33,22 @@ transformations_1:
mtu: 65000
provider: ovs
- action: add-br
- name: br-prv
- provider: ovs
- - action: add-br
- name: br-aux
- - action: add-patch
- bridges:
- - br-prv
- - br-aux
- mtu: 65000
- provider: ovs
+ name: br-mesh
- action: add-port
bridge: br-fw-admin
- name: eth0
- - action: add-port
- bridge: br-aux
- name: eth2
+ name: eno1
- action: add-port
bridge: br-mgmt
- name: eth2.901
+ name: ens1f0.901
- action: add-port
bridge: br-storage
- name: eth2.902
+ name: ens1f0.902
- action: add-port
bridge: br-ex
- name: eth2.752
+ name: ens1f0.752
+ - action: add-port
+ bridge: br-mesh
+ name: ens1f0.103
fuel:
ADMIN_NETWORK:
dhcp_pool_end: 10.20.0.254
@@ -81,6 +72,7 @@ network:
dns_nameservers:
- 8.8.4.4
- 8.8.8.8
+ floating_name: admin_floating_net
floating_ranges:
- - 10.118.36.176
- 10.118.36.185
@@ -89,28 +81,13 @@ network:
- 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: vlan
+ segmentation_type: tun
vlan_range:
- - 2040
- - 2050
+ - 1000
+ - 1030
networks:
- - cidr: null
- gateway: null
- ip_ranges: []
- meta:
- configurable: false
- map_priority: 2
- name: private
- neutron_vlan_range: true
- notation: null
- render_addr_mask: null
- render_type: null
- seg_type: vlan
- use_gateway: false
- vlan_start: null
- name: private
- vlan_start: null
- cidr: 10.118.36.0/24
gateway: 10.118.36.1
ip_ranges:
@@ -138,14 +115,14 @@ network:
- cidr: 192.168.20.0/24
gateway: null
ip_ranges:
- - - 192.168.20.1
+ - - 192.168.20.12
- 192.168.20.254
meta:
cidr: 192.168.1.0/24
configurable: true
map_priority: 2
name: storage
- notation: cidr
+ notation: ip_ranges
render_addr_mask: storage
render_type: cidr
use_gateway: false
@@ -172,6 +149,24 @@ network:
vlan_start: 101
name: management
vlan_start: 901
+ - cidr: 192.168.2.0/24
+ gateway: null
+ ip_ranges:
+ - - 192.168.2.1
+ - 192.168.2.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: 103
- cidr: 10.20.0.0/24
gateway: 10.20.0.2
ip_ranges: