diff options
| -rw-r--r-- | labs/ericsson/pod2/fuel/config/dea-pod-override.yaml | 74 |
1 files changed, 20 insertions, 54 deletions
diff --git a/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml b/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml index 1dbc825..558abec 100644 --- a/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml +++ b/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml @@ -2,18 +2,17 @@ dea-pod-override-config-metadata: title: 'Deployment Environment Adapter POD override for Ericsson-1, POD-2' # DEA API version supported version: '0.2' - created: 'Jan 26 2016' - comment: 'Rebased for Fuel8' + created: 'Tue Jun 14 2016' + comment: 'Rebased for Fuel 9' environment: name: FUEL-BM1-POD2 interfaces_1: - eno49: + eno50: - fuelweb_admin ens1f0: - public - management - storage - ens1f1: - private transformations_1: transformations: @@ -38,7 +37,7 @@ transformations_1: name: br-mesh - action: add-port bridge: br-fw-admin - name: eno49 + name: eno50 - action: add-port bridge: br-mgmt name: ens1f0.100 @@ -50,43 +49,7 @@ transformations_1: name: ens1f0.753 - action: add-port bridge: br-mesh - 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 + name: ens1f0.300 fuel: ADMIN_NETWORK: dhcp_pool_end: 10.20.0.254 @@ -125,8 +88,8 @@ network: - cidr: 10.118.101.0/24 gateway: 10.118.101.1 ip_ranges: - - - 10.118.101.180 - - 10.118.101.190 + - - 10.118.101.160 + - 10.118.101.170 meta: cidr: 172.16.0.0/24 configurable: true @@ -220,13 +183,15 @@ settings: editable: external_dns: dns_list: - description: List of upstream DNS servers, separated by comma + description: List of upstream DNS servers label: DNS list + max: 3 regex: - error: Invalid IP address list - source: ^\*$|^(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3}(?:\s*,\s*(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3})*$ - type: text - value: 10.118.32.193 + error: Invalid IP address + source: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$ + type: text_list + value: + - 10.118.32.193 weight: 10 metadata: group: network @@ -238,13 +203,14 @@ settings: label: Host OS NTP Servers weight: 40 ntp_list: - description: List of upstream NTP servers, separated by comma + description: List of upstream NTP servers label: NTP server list regex: - error: Invalid NTP server list - source: ^\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(?:\.\d{1,3}){3})\s*(?:,\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(\.\d{1,3}){3})\s*)*$ - type: text - value: 10.118.32.193 + error: Invalid NTP server + source: ^[a-zA-Z\d]+[-\.\da-zA-Z]*$ + type: text_list + value: + - 10.118.32.193 weight: 10 syslog: metadata: |