diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-22 20:33:38 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-24 23:06:32 +0000 |
commit | f431509110f5c820a5b458e61d086d2fcc61a83a (patch) | |
tree | de50ccb9b12f6b15dae7305c54090d9722bf8312 /labs/zte/pod2 | |
parent | 067568f1a4449fbfd07c608d7504c9ec48a07334 (diff) |
cleanup: fuel: Remove obsolete reap, dea, dha
Old Fuel (up to and including Danube release) relied on a DEA/DHA
pair of configuration files, usually constructed based on information
collected from a manually deployed POD using a "reap" procedure.
Starting with Euphrates, Fuel will use the PDF as input, so DEA/DHA,
as well as reap data are now obsolete.
Some PODs (arm-pod5, lf-pod2) still have a "local_env" configuration
file, which is a leftover from old Fuel, but can only be dropped
after Fuel automatically detects the jumphost bridge names (either by
matching the IP addresses on the jumphost to the networks in PDF, or
by using a static mapping defined in a PDF companion file, e.g. IDF).
Remove all obsolete configuration, including useless directories.
Change-Id: I9eae2067d83347409c17126aadb19e3d6b95d4b6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'labs/zte/pod2')
-rw-r--r-- | labs/zte/pod2/fuel/config/dea-pod-override.yaml | 318 | ||||
-rw-r--r-- | labs/zte/pod2/fuel/config/dha.yaml | 51 |
2 files changed, 0 insertions, 369 deletions
diff --git a/labs/zte/pod2/fuel/config/dea-pod-override.yaml b/labs/zte/pod2/fuel/config/dea-pod-override.yaml deleted file mode 100644 index 1ca2769..0000000 --- a/labs/zte/pod2/fuel/config/dea-pod-override.yaml +++ /dev/null @@ -1,318 +0,0 @@ -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# 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 Development Pipeline - Default version' - version: '0.3' - created: 'Jan 26 2016' - comment: 'Rebased for Fuel8' -environment: - name: opnfv -fuel: - ADMIN_NETWORK: - dhcp_pool_end: 10.20.7.200 - dhcp_pool_start: 10.20.7.10 - ipaddress: 10.20.7.2 - netmask: 255.255.255.0 - DNS_DOMAIN: domain.tld - DNS_SEARCH: domain.tld - DNS_UPSTREAM: 172.70.0.1 - HOSTNAME: fuel - NTP1: 172.70.0.1 - NTP2: - NTP3: -interfaces_1: - ens4f0: - - fuelweb_admin - ens12f0: - - management - ens12f1: - - storage - ens44f0: - - private - ens44f1: - - public -interfaces_vlan: - ens4f0: - - fuelweb_admin - ens12f0: - - management - ens12f1: - - storage - ens44f0: - - private - ens44f1: - - public -interfaces_dpdk: - ens4f0: - - fuelweb_admin - ens12f0: - - management - ens12f1: - - storage - ens44f0: - - private - - interface_properties: - dpdk: - enabled: - value: true - ens44f1: - - public -network: - networking_parameters: - base_mac: fa:16:3e:00:00:00 - configuration_template: null - dns_nameservers: - - 172.10.0.1 - floating_name: admin_floating_net - floating_ranges: - - - 172.70.0.130 - - 172.70.0.230 - 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: 192.168.71.0/24 - gateway: null - group_id: 2 - id: 7 - ip_ranges: - - - 192.168.71.1 - - 192.168.71.254 - meta: - cidr: 192.168.0.0/24 - configurable: true - map_priority: 2 - name: management - notation: cidr - render_addr_mask: internal - render_type: cidr - use_gateway: false - vips: - - haproxy - - vrouter - vlan_start: 101 - name: management - vlan_start: 171 - - cidr: 192.168.73.0/24 - gateway: null - group_id: 2 - id: 9 - ip_ranges: - - - 192.168.73.1 - - 192.168.73.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: 1130 - - cidr: 172.70.0.0/24 - gateway: 172.70.0.1 - group_id: 2 - id: 6 - ip_ranges: - - - 172.70.0.10 - - 172.70.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: 173 - - cidr: 192.168.72.0/24 - gateway: null - group_id: 2 - id: 8 - ip_ranges: - - - 192.168.72.1 - - 192.168.72.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: 172 - - cidr: 10.20.7.0/24 - gateway: 10.20.7.2 - group_id: null - id: 1 - ip_ranges: - - - 10.20.7.10 - - 10.20.7.200 - meta: - configurable: false - map_priority: 0 - notation: ip_ranges - render_addr_mask: null - render_type: null - unmovable: true - use_gateway: true - name: fuelweb_admin - vlan_start: null - public_vip: 172.70.0.11 - public_vrouter_vip: 172.70.0.10 -settings: - editable: - external_dns: - dns_list: - description: List of upstream DNS servers, separated by comma - label: DNS list - 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: 172.10.0.1 - weight: 10 - metadata: - group: network - label: Host OS DNS Servers - weight: 30 - external_ntp: - metadata: - group: network - label: Host OS NTP Servers - weight: 40 - ntp_list: - description: List of upstream NTP servers, separated by comma - 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: 172.70.0.1 - weight: 10 - syslog: - metadata: - enabled: false - group: logging - label: Syslog - toggleable: true - weight: 50 - syslog_port: - description: Remote syslog port - label: Port - regex: - error: Invalid syslog port - source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$ - type: text - value: '514' - weight: 20 - 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 - syslog_transport: - label: Syslog transport protocol - type: radio - value: tcp - values: - - data: udp - description: '' - label: UDP - - data: tcp - description: '' - label: TCP - weight: 30 - repo_setup: - metadata: - always_editable: true - group: general - label: Repositories - weight: 50 - repos: - description: 'Please note: the first repository will be considered the operating - system mirror that will be used during node provisioning. - - To create a local repository mirror on the Fuel master node, please follow - the instructions provided by running "fuel-createmirror --help" on the Fuel - master node. - - Please make sure your Fuel master node has Internet access to the repository - before attempting to create a mirror. - - ' - extra_priority: null - type: custom_repo_configuration - value: - - name: ubuntu - priority: null - section: main - suite: xenial - type: deb - uri: http://10.20.7.2:8080/mirrors/ubuntu/ - - name: ubuntu-main - priority: null - section: main universe multiverse - suite: xenial - type: deb - uri: http://archive.ubuntu.com/ubuntu/ - - name: ubuntu-updates - priority: null - section: main universe multiverse - suite: xenial-updates - type: deb - uri: http://archive.ubuntu.com/ubuntu/ - - name: ubuntu-security - priority: null - section: main universe multiverse - suite: xenial-security - type: deb - uri: http://archive.ubuntu.com/ubuntu/ - - name: mos - priority: 1050 - section: main restricted - suite: mos10.0 - type: deb - uri: http://10.20.7.2:8080/newton-10.0/ubuntu/x86_64 - - name: Auxiliary - priority: 1150 - section: main restricted - suite: auxiliary - type: deb - uri: http://10.20.7.2:8080/newton-10.0/ubuntu/auxiliary diff --git a/labs/zte/pod2/fuel/config/dha.yaml b/labs/zte/pod2/fuel/config/dha.yaml deleted file mode 100644 index 98ee6a0..0000000 --- a/labs/zte/pod2/fuel/config/dha.yaml +++ /dev/null @@ -1,51 +0,0 @@ -dha-pod-config-metadata: - title: Deployment Hardware Adapter (DHA) for fuel development pipeline - default version - version: 0.0.3 - created: Feb 1 2016 - comment: Default Fuel8 version - -# Adapter to use for this definition -adapter: zte - -# Node list. -# Mandatory property is id, all other properties are adapter specific. - -nodes: -- id: 1 - pxeMac: 74:4A:A4:00:CD:72 - ipmiIp: 192.168.1.106 - ipmiUser: zteroot - ipmiPass: superuser -- id: 2 - pxeMac: 74:4A:A4:00:CA:CC - ipmiIp: 192.168.1.107 - ipmiUser: zteroot - ipmiPass: superuser -- id: 3 - pxeMac: 74:4A:A4:00:CD:12 - ipmiIp: 192.168.1.108 - ipmiUser: zteroot - ipmiPass: superuser -- id: 4 - pxeMac: 74:4A:A4:00:CF:40 - ipmiIp: 192.168.1.109 - ipmiUser: zteroot - ipmiPass: superuser -- id: 5 - pxeMac: 74:4A:A4:00:CE:D4 - ipmiIp: 192.168.1.110 - ipmiUser: zteroot - ipmiPass: superuser - - -# Adding the Fuel node as node id 7 which may not be correct - please -# adjust as needed. -- id: 7 - libvirtName: fuel-opnfv-2 - libvirtTemplate: templates/hardware_environment/vms/fuel.xml - isFuel: yes - username: root - password: r00tme - -disks: - fuel: 100G |