From 285d2cd0d849696b9e20a33904f02c819735e13a Mon Sep 17 00:00:00 2001 From: "Stefan K. Berg" Date: Mon, 13 Jun 2016 09:26:57 +0200 Subject: Modification of deployment config for Fuel 9 and ELX lab Change-Id: I380087889cda079a56c8cea3acc13145dcd49046 Signed-off-by: Stefan K. Berg --- .../elx/fuel/config/dea-pod-override.yaml | 111 +++++++++------------ .../labs/devel-pipeline/elx/fuel/config/dha.yaml | 2 +- 2 files changed, 50 insertions(+), 63 deletions(-) (limited to 'deploy/config/labs') diff --git a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml index 8ede3d683..cf408f083 100644 --- a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml +++ b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml @@ -61,41 +61,23 @@ transformations_1: - action: add-port bridge: br-ex name: ens6 -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: ens3 - - action: add-port - bridge: br-mgmt - name: ens3.101 - - action: add-port - bridge: br-storage - name: ens4.102 - - action: add-port - bridge: br-mesh - name: ens5.103 fuel: ADMIN_NETWORK: dhcp_pool_end: 10.20.0.254 dhcp_pool_start: 10.20.0.3 ipaddress: 10.20.0.2 netmask: 255.255.255.0 - DNS_DOMAIN: opnfv.org - DNS_SEARCH: opnfv.org + ssh_network: 10.20.0.0/24 + DNS_DOMAIN: domain.tld + DNS_SEARCH: domain.tld DNS_UPSTREAM: 147.214.6.234 - HOSTNAME: opnfv_virt - NTP1: 193.181.14.10 - NTP2: 193.181.14.11 - NTP3: '' + FUEL_ACCESS: + password: admin + user: admin + HOSTNAME: fuel + NTP1: time1.ericsson.se + NTP2: time2.ericsson.se + NTP3: time2.ericsson.se network: networking_parameters: base_mac: fa:16:3e:00:00:00 @@ -118,30 +100,6 @@ network: - 1000 - 1030 networks: - - cidr: 172.16.0.0/24 - gateway: 172.16.0.1 - ip_ranges: - - - 172.16.0.2 - - 172.16.0.126 - meta: - cidr: 172.16.0.0/24 - configurable: true - floating_range_var: floating_ranges - ip_range: - - 172.16.0.2 - - 172.16.0.126 - map_priority: 1 - name: public - notation: ip_ranges - render_addr_mask: public - render_type: null - use_gateway: true - vips: - - haproxy - - vrouter - vlan_start: null - name: public - vlan_start: null - cidr: 192.168.1.0/24 gateway: null ip_ranges: @@ -197,6 +155,30 @@ network: vlan_start: 103 name: private vlan_start: 103 + - cidr: 172.16.0.0/24 + gateway: 172.16.0.1 + ip_ranges: + - - 172.16.0.2 + - 172.16.0.126 + meta: + cidr: 172.16.0.0/24 + configurable: true + floating_range_var: floating_ranges + ip_range: + - 172.16.0.2 + - 172.16.0.126 + map_priority: 1 + name: public + notation: ip_ranges + render_addr_mask: public + render_type: null + use_gateway: true + vips: + - haproxy + - vrouter + vlan_start: null + name: public + vlan_start: null - cidr: 10.20.0.0/24 gateway: 10.20.0.2 ip_ranges: @@ -216,13 +198,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: 147.214.6.234 + 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: + - 147.214.6.234 weight: 10 metadata: group: network @@ -234,13 +218,15 @@ 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: 193.181.14.10, 193.181.14.11 + error: Invalid NTP server + source: ^[a-zA-Z\d]+[-\.\da-zA-Z]*$ + type: text_list + value: + - time1.ericsson.se + - time2.ericsson.se weight: 10 syslog: metadata: @@ -279,3 +265,4 @@ settings: description: '' label: TCP weight: 30 + diff --git a/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml b/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml index 07faeb1f2..f9580124d 100644 --- a/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml +++ b/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml @@ -2,7 +2,7 @@ dha-pod-config-metadata: title: Deployment Hardware Adapter (DHA) for fuel development pipeline - Ericsson ELX version version: 0.0.3 created: Feb 2 2016 - comment: ELX Fuel8 version + comment: ELX Fuel 9 version # Adapter to use for this definition adapter: libvirt -- cgit 1.2.3-korg