diff options
Diffstat (limited to 'labs/intel/virtual_kvm')
| -rw-r--r-- | labs/intel/virtual_kvm/fuel/config/dea-pod-override.yaml | 221 |
1 files changed, 105 insertions, 116 deletions
diff --git a/labs/intel/virtual_kvm/fuel/config/dea-pod-override.yaml b/labs/intel/virtual_kvm/fuel/config/dea-pod-override.yaml index 691d3dd..6af2f53 100644 --- a/labs/intel/virtual_kvm/fuel/config/dea-pod-override.yaml +++ b/labs/intel/virtual_kvm/fuel/config/dea-pod-override.yaml @@ -1,37 +1,29 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# stefan.k.berg@ericsson.com +# jonas.bjurel@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + dea-pod-override-config-metadata: - title: 'Deployment Environment Adapter POD override for Intel-1 virtual deployment' - version: '0.1' - created: 'Thu Jan 7 2016' - comment: 'None' + title: 'Deployment Environment Adapter POD override for Intel-1_virtual_deployment' + version: '0.2' + created: 'Tue Jun 14 2016' + comment: 'Rebased for Fuel 9' environment: name: opnfv_virt -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 - netmask: 255.255.0.0 - DNS_DOMAIN: opnfvericsson.se - DNS_SEARCH: opnfvericsson.se - DNS_UPSTREAM: 8.8.8.8 - FUEL_ACCESS: - password: admin - user: admin - HOSTNAME: opnfv_virt - NTP1: 188.126.88.9 - NTP2: 193.228.143.12 - NTP3: 178.73.198.130 interfaces_1: - eth0: + ens3: - fuelweb_admin - management - eth1: + ens4: - storage - eth2: + ens5: - private - eth3: + ens6: - public transformations_1: transformations: @@ -56,27 +48,40 @@ transformations_1: name: br-mesh - action: add-port bridge: br-fw-admin - name: eth0 + name: ens3 - action: add-port bridge: br-mgmt - name: eth0.101 + name: ens3.101 - action: add-port bridge: br-storage - name: eth1.102 + name: ens4.102 - action: add-port bridge: br-mesh - name: eth2.103 + name: ens5.103 - action: add-port bridge: br-ex - name: eth3 + name: ens6 +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 + ssh_network: 10.20.0.0/24 + DNS_DOMAIN: domain.tld + DNS_SEARCH: domain.tld + DNS_UPSTREAM: 8.8.8.8 + HOSTNAME: fuel + NTP1: 188.126.88.9 + NTP2: 193.228.143.12 + NTP3: 178.73.198.130 network: - management_vip: 192.168.0.2 - management_vrouter_vip: 192.168.0.1 networking_parameters: base_mac: fa:16:3e:00:00:00 configuration_template: null dns_nameservers: - 8.8.8.8 + floating_name: admin_floating_net floating_ranges: - - 172.16.0.130 - 172.16.0.254 @@ -85,36 +90,30 @@ 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: tun vlan_range: - 1000 - 1030 networks: - - cidr: 172.16.0.0/24 - gateway: 172.16.0.1 + - cidr: 192.168.1.0/24 + gateway: null ip_ranges: - - - 172.16.0.2 - - 172.16.0.126 + - - 192.168.1.1 + - 192.168.1.254 meta: - cidr: 172.16.0.0/24 + cidr: 192.168.1.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 + map_priority: 2 + name: storage + notation: cidr + render_addr_mask: storage + render_type: cidr + use_gateway: false + vlan_start: 102 + name: storage + vlan_start: 102 - cidr: 192.168.0.0/24 gateway: null ip_ranges: @@ -135,23 +134,6 @@ network: vlan_start: 101 name: management vlan_start: 101 - - cidr: 192.168.1.0/24 - gateway: null - ip_ranges: - - - 192.168.1.1 - - 192.168.1.254 - meta: - cidr: 192.168.1.0/24 - configurable: true - map_priority: 2 - name: storage - notation: cidr - render_addr_mask: storage - render_type: cidr - use_gateway: false - vlan_start: 102 - name: storage - vlan_start: 102 - cidr: 192.168.2.0/24 gateway: null ip_ranges: @@ -170,7 +152,31 @@ network: vlan_start: 103 name: private vlan_start: 103 - - cidr: 10.20.0.0/16 + - 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: - - 10.20.0.3 @@ -185,68 +191,47 @@ network: use_gateway: true name: fuelweb_admin vlan_start: null - public_vip: 172.16.0.3 - public_vrouter_vip: 172.16.0.2 - vips: - management: - ipaddr: 192.168.0.2 - namespace: haproxy - network_role: mgmt/vip - node_roles: - - controller - - primary-controller - public: - ipaddr: 172.16.0.3 - namespace: haproxy - network_role: public/vip - node_roles: - - controller - - primary-controller - vrouter: - ipaddr: 192.168.0.1 - namespace: vrouter - network_role: mgmt/vip - node_roles: - - controller - - primary-controller - vrouter_pub: - ipaddr: 172.16.0.2 - namespace: vrouter - network_role: public/vip - node_roles: - - controller - - primary-controller 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: 8.8.8.8 + 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: + - 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 + 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: 188.126.88.9, 193.228.143.12, 178.73.198.130 + error: Invalid NTP server + source: ^[a-zA-Z\d]+[-\.\da-zA-Z]*$ + type: text_list + value: + - 188.126.88.9 + - 193.228.143.12 + - 178.73.198.130 weight: 10 syslog: metadata: + enabled: false + group: logging label: Syslog + toggleable: true weight: 50 syslog_port: description: Remote syslog port @@ -260,6 +245,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 @@ -274,4 +262,5 @@ settings: - data: tcp description: '' label: TCP - weight: 30
\ No newline at end of file + weight: 30 + |