From 65319d245545dd6ca3444f8ab2044b1b418c4af0 Mon Sep 17 00:00:00 2001 From: Jonas Bjurel Date: Wed, 3 Feb 2016 11:53:34 +0100 Subject: LF-POD2 configuration rebased for Fuel8 Change-Id: I4d0dc9545d8d4637ae011f9950cc6596b2fa5071 Signed-off-by: Jonas Bjurel --- labs/lf/pod2/fuel/config/dea-pod-override.yaml | 141 ++++++++++++++----------- 1 file changed, 80 insertions(+), 61 deletions(-) diff --git a/labs/lf/pod2/fuel/config/dea-pod-override.yaml b/labs/lf/pod2/fuel/config/dea-pod-override.yaml index 4e67890..f6868d1 100644 --- a/labs/lf/pod2/fuel/config/dea-pod-override.yaml +++ b/labs/lf/pod2/fuel/config/dea-pod-override.yaml @@ -1,14 +1,12 @@ dea-pod-override-config-metadata: title: 'Deployment Environment Adapter POD override for LF, POD2' - version: '0.1' - created: 'Tue Jan 12 2016' - comment: 'Config for LF POD2' + version: '0.2' + created: 'Wed Feb 3 2016' + comment: 'Config for LF POD2, Rebased for Fuel8' environment: name: opnfv fuel: ADMIN_NETWORK: - cidr: 10.20.0.0/24 - dhcp_gateway: 10.20.0.2 dhcp_pool_end: 10.20.0.254 dhcp_pool_start: 10.20.0.3 ipaddress: 10.20.0.2 @@ -24,12 +22,12 @@ fuel: NTP2: 1.pool.ntp.org NTP3: 2.pool.ntp.org interfaces_1: - eth0: + enp6s0: - fuelweb_admin - management - storage - private - eth2: + enp8s0: - public transformations_1: transformations: @@ -54,19 +52,41 @@ transformations_1: name: br-mesh - action: add-port bridge: br-fw-admin - name: eth0 + name: enp6s0 - action: add-port bridge: br-mgmt - name: eth0.300 + name: enp6s0.300 - action: add-port bridge: br-storage - name: eth0.301 + name: enp6s0.301 - action: add-port bridge: br-mesh - name: eth0.302 + name: enp6s0.302 - action: add-port bridge: br-ex - name: eth2 + name: enp8s0 +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-mesh + - action: add-port + bridge: br-fw-admin + name: enp6s0 + - action: add-port + bridge: br-mgmt + name: enp6s0.300 + - action: add-port + bridge: br-storage + name: enp6s0.301 + - action: add-port + bridge: br-mesh + name: enp6s0.302 network: management_vip: 192.168.1.2 management_vrouter_vip: 192.168.1.1 @@ -89,12 +109,34 @@ network: vlan_range: - 1000 - 1030 +network: + networking_parameters: + base_mac: fa:16:3e:00:00:00 + configuration_template: null + dns_nameservers: + - 8.8.4.4 + - 8.8.8.8 + floating_name: admin_floating_net + floating_ranges: + - - 172.30.10.130 + - 172.30.10.254 + 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: 172.30.10.0/24 gateway: 172.30.10.1 ip_ranges: - - - 172.30.10.64 - - 172.30.10.159 + - - 172.30.10.2 + - 172.30.10.126 meta: cidr: 172.16.0.0/24 configurable: true @@ -123,17 +165,14 @@ network: cidr: 192.168.1.0/24 configurable: true map_priority: 2 - name: management + name: storage notation: cidr - render_addr_mask: internal + render_addr_mask: storage render_type: cidr use_gateway: false - vips: - - haproxy - - vrouter - vlan_start: 101 - name: management - vlan_start: 300 + vlan_start: 102 + name: storage + vlan_start: 301 - cidr: 192.168.0.0/24 gateway: null ip_ranges: @@ -143,14 +182,17 @@ network: cidr: 192.168.0.0/24 configurable: true map_priority: 2 - name: storage + name: management notation: cidr - render_addr_mask: storage + render_addr_mask: internal render_type: cidr use_gateway: false - vlan_start: 102 - name: storage - vlan_start: 301 + vips: + - haproxy + - vrouter + vlan_start: 101 + name: management + vlan_start: 300 - cidr: 192.168.2.0/24 gateway: null ip_ranges: @@ -184,37 +226,6 @@ network: use_gateway: true name: fuelweb_admin vlan_start: null - public_vip: 172.30.10.64 - public_vrouter_vip: 172.30.10.65 - vips: - management: - ipaddr: 192.168.1.2 - namespace: haproxy - network_role: mgmt/vip - node_roles: - - controller - - primary-controller - public: - ipaddr: 172.30.10.64 - namespace: haproxy - network_role: public/vip - node_roles: - - controller - - primary-controller - vrouter: - ipaddr: 192.168.1.1 - namespace: vrouter - network_role: mgmt/vip - node_roles: - - controller - - primary-controller - vrouter_pub: - ipaddr: 172.30.10.65 - namespace: vrouter - network_role: public/vip - node_roles: - - controller - - primary-controller settings: editable: external_dns: @@ -225,15 +236,17 @@ settings: 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: 8.8.8.8, 8.8.4.4 + value: 8.8.8.8 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 @@ -245,7 +258,10 @@ settings: weight: 10 syslog: metadata: + enabled: false + group: logging label: Syslog + toggleable: true weight: 50 syslog_port: description: Remote syslog port @@ -259,6 +275,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 -- cgit 1.2.3-korg