From 05a1d23b01900fd425da2580cbfcaf7098edc94b Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 22 Sep 2017 20:33:38 +0200 Subject: 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 (cherry picked from commit f431509110f5c820a5b458e61d086d2fcc61a83a) --- .../pod3/fuel/config/dea-pod-override.yaml | 244 --------------------- labs/ericsson/pod3/fuel/config/dha.yaml | 82 ------- 2 files changed, 326 deletions(-) delete mode 100644 labs/ericsson/pod3/fuel/config/dea-pod-override.yaml delete mode 100644 labs/ericsson/pod3/fuel/config/dha.yaml (limited to 'labs/ericsson/pod3') diff --git a/labs/ericsson/pod3/fuel/config/dea-pod-override.yaml b/labs/ericsson/pod3/fuel/config/dea-pod-override.yaml deleted file mode 100644 index 4556a8c..0000000 --- a/labs/ericsson/pod3/fuel/config/dea-pod-override.yaml +++ /dev/null @@ -1,244 +0,0 @@ -dea-pod-override-config-metadata: - title: 'Deployment Environment Adapter POD override for ERICSSON-POD3' -# DEA API version supported - version: '0.2' - created: 'Tues Sept 20 2016' - comment: 'ERICSSON-POD3 - Manual Authoring of File - Daniel Smith' -environment: - name: ERICSSON-POD3 -interfaces_1: - eno49: - - fuelweb_admin - ens1f0: - - public - ens1f1: - - management - - storage - - private -interfaces_vlan: - eno49: - - fuelweb_admin - ens1f0: - - public - ens1f1: - - management - - storage - ens2f0: - - private -interfaces_dpdk: - eno49: - - fuelweb_admin - ens1f0: - - public - ens1f1: - - management - - storage - ens2f0: - - private - - interface_properties: - dpdk: - enabled: - value: true -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: 0.0.0.0/0 - DNS_DOMAIN: opnfvericsson.se - DNS_SEARCH: opnfvericsson.se - DNS_UPSTREAM: 8.8.8.8 - HOSTNAME: fuel-ericsson-pod3 - NTP1: 0.se.pool.ntp.org - NTP2: 1.se.pool.ntp.org - NTP3: 2.se.pool.ntp.org -network: - networking_parameters: - base_mac: fa:16:3e:00:00:00 - configuration_template: null - dns_nameservers: - - 8.8.8.4 - - 8.8.8.8 - floating_name: admin_floating_net - floating_ranges: - - - 190.10.1.101 - - 190.10.1.200 - 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 - - 1019 - networks: - - cidr: 190.10.1.0/24 - gateway: 190.10.1.1 - ip_ranges: - - - 190.10.1.15 - - 190.10.1.100 - 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: 200 - - 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: 201 - - cidr: 192.168.0.0/24 - gateway: null - ip_ranges: - - - 192.168.0.1 - - 192.168.0.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: 203 - - cidr: 192.168.2.0/24 - gateway: null - ip_ranges: - - - 192.168.2.1 - - 192.168.2.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: 1000 - - cidr: 10.20.0.0/24 - gateway: 10.20.0.2 - ip_ranges: - - - 10.20.0.3 - - 10.20.0.254 - 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 -settings: - editable: - external_dns: - dns_list: - description: List of upstream DNS servers - label: DNS list - max: 3 - regex: - 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: 30 - external_ntp: - metadata: - group: network - label: Host OS NTP Servers - weight: 40 - ntp_list: - description: List of upstream NTP servers - label: NTP server list - regex: - error: Invalid NTP server - source: ^[a-zA-Z\d]+[-\.\da-zA-Z]*$ - type: text_list - value: - - 0.se.pool.ntp.org - - 1.se.pool.ntp.org - - 2.se.pool.ntp.org - 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 diff --git a/labs/ericsson/pod3/fuel/config/dha.yaml b/labs/ericsson/pod3/fuel/config/dha.yaml deleted file mode 100644 index ab89d3f..0000000 --- a/labs/ericsson/pod3/fuel/config/dha.yaml +++ /dev/null @@ -1,82 +0,0 @@ -dha-pod-config-metadata: - title: Deployment Hardware Adapter (DHA) -# DHA API version supported - version: 0.0.3 - created: Mon Sep 19 13:41:29 2016 - comment: ERICSSON-POD3 DHA (SPAREWHEEL IMPLEMENTATION) - lmcdasm - -# Adapter to use for this definition -# adapter: [ipmi|libvirt] -adapter: ipmi - -# Node list. -# Mandatory properties are id and role. -# All other properties are adapter specific. -# For Non-Fuel nodes controlled by: -# - ipmi adapter you need to provide: -# pxeMac -# ipmiIp -# ipmiUser -# ipmiPass -# and you *MAY* provide (optional, not added by reap.py): -# ipmiPort -# - libvirt adapter you need to provide: -# libvirtName: -# libvirtTemplate: [libvirt/vms/controller.xml | libvirt/vms/compute.xml] -# -# For the Fuel Node you need to provide: -# libvirtName: -# libvirtTemplate: libvirt/vms/fuel.xml -# isFuel: yes -# username: root -# password: r00tme - -nodes: - -- id: 1 - ipmiIp: 164.10.1.6 - ipmiPass: ci_opnfv - ipmiUser: opnfv_ci - libvirtName: null - libvirtTemplate: null - pxeMac: ec:b1:d7:9d:b3:90 -- id: 2 - ipmiIp: 164.10.1.7 - ipmiPass: ci_opnfv - ipmiUser: opnfv_ci - libvirtName: null - libvirtTemplate: null - pxeMac: ec:b1:d7:9d:95:60 -- id: 3 - ipmiIp: 164.10.1.8 - ipmiPass: ci_opnfv - ipmiUser: opnfv_ci - libvirtName: null - libvirtTemplate: null - pxeMac: ec:b1:d7:9d:b2:d0 -- id: 4 - ipmiIp: 164.10.1.9 - ipmiPass: ci_opnfv - ipmiUser: opnfv_ci - libvirtName: null - libvirtTemplate: null - pxeMac: ec:b1:d7:9d:a1:10 -- id: 5 - ipmiIp: 164.10.1.10 - ipmiPass: ci_opnfv - ipmiUser: opnfv_ci - libvirtName: null - libvirtTemplate: null - pxeMac: ec:b1:d7:9d:9c:20 -# Adding the Fuel node as node id 1 -# which may not be correct - please adjust as needed. -- id: 6 - isFuel: true - libvirtName: FUEL - libvirtTemplate: templates/hardware_environment/vms/ericsson_montreal_lab/fuel.xml - password: r00tme - username: root -disks: - compute: 100G - controller: 100G - fuel: 100G -- cgit 1.2.3-korg