From f431509110f5c820a5b458e61d086d2fcc61a83a 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 --- labs/huawei/pod6/fuel/config/dea-pod-override.yaml | 241 --------------------- labs/huawei/pod6/fuel/config/dha.yaml | 51 ----- 2 files changed, 292 deletions(-) delete mode 100644 labs/huawei/pod6/fuel/config/dea-pod-override.yaml delete mode 100644 labs/huawei/pod6/fuel/config/dha.yaml (limited to 'labs/huawei/pod6') diff --git a/labs/huawei/pod6/fuel/config/dea-pod-override.yaml b/labs/huawei/pod6/fuel/config/dea-pod-override.yaml deleted file mode 100644 index 7172f61..0000000 --- a/labs/huawei/pod6/fuel/config/dea-pod-override.yaml +++ /dev/null @@ -1,241 +0,0 @@ - -dea-pod-override-config-metadata: - title: 'Deployment Environment Adapter POD override for HUAWEI, POD6' - version: '0.1' - created: 'Wed Aug 24 2016' - comment: 'Config for HUAWEI POD6, Rebased for Fuel9' -environment: - name: opnfv - -interfaces_1: - enp2s0f0: - - fuelweb_admin - - management - - storage - - private - enp2s0f1: - - public -transformations_1: - 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-ex - - action: add-br - name: br-floating - provider: ovs - - action: add-patch - bridges: - - br-floating - - br-ex - mtu: 65000 - provider: ovs - - action: add-br - name: br-mesh - - action: add-port - bridge: br-fw-admin - name: enp2s0f0 - - action: add-port - bridge: br-mgmt - name: enp2s0f0.101 - - action: add-port - bridge: br-storage - name: enp2s0f0.102 - - action: add-port - bridge: br-mesh - name: enp2s0f0.103 - - action: add-port - bridge: br-ex - name: enp2s0f1 -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: domain.tld - DNS_SEARCH: domain.tld - DNS_UPSTREAM: 114.114.114.114 - FUEL_ACCESS: - password: admin - user: admin - HOSTNAME: opnfv - NTP1: 0.pool.ntp.org - NTP2: 1.pool.ntp.org - NTP3: 2.pool.ntp.org - -network: - networking_parameters: - base_mac: fa:16:3e:00:00:00 - configuration_template: null - dns_nameservers: - - 114.114.114.114 - floating_name: admin_floating_net - floating_ranges: - - - 192.168.22.110 - - 192.168.22.210 - 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.22.0/24 - gateway: 192.168.22.1 - ip_ranges: - - - 192.168.22.11 - - 192.168.22.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: null - - 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: 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: - - - 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: 103 - - cidr: 10.20.0.0/16 - 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: - 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 universe multiverse - suite: trusty - type: deb - uri: http://10.20.0.2:8080/mirrors/ubuntu/ - - name: ubuntu-updates - priority: null - section: main universe multiverse - suite: trusty-updates - type: deb - uri: http://10.20.0.2:8080/mirrors/ubuntu/ - - name: ubuntu-security - priority: null - section: main universe multiverse - suite: trusty-security - type: deb - uri: http://10.20.0.2:8080/mirrors/ubuntu/ - - name: mos - priority: 1050 - section: main restricted - suite: mos9.0 - type: deb - uri: http://10.20.0.2:8080/mitaka-9.0/ubuntu/x86_64 - - name: Auxiliary - priority: 1150 - section: main restricted - suite: auxiliary - type: deb - uri: http://10.20.0.2:8080/mitaka-9.0/ubuntu/auxiliary diff --git a/labs/huawei/pod6/fuel/config/dha.yaml b/labs/huawei/pod6/fuel/config/dha.yaml deleted file mode 100644 index 605f332..0000000 --- a/labs/huawei/pod6/fuel/config/dha.yaml +++ /dev/null @@ -1,51 +0,0 @@ -dha-pod-config-metadata: - title: Deployment Hardware Adapter (DHA) for fuel development on Huawei Pod 6 - version: 0.0.1 - created: Aug 24 2016 - comment: Fuel9 version - -# Adapter to use for this definition -adapter: ipmi - -# Node list. -# Mandatory property is id, all other properties are adapter specific. - -nodes: -- id: 1 - pxeMac: E8:4D:D0:BA:63:95 - ipmiIp: 172.16.131.11 - ipmiUser: root - ipmiPass: Huawei@123 -- id: 2 - pxeMac: E8:4D:D0:BA:63:51 - ipmiIp: 172.16.131.12 - ipmiUser: root - ipmiPass: Huawei@123 -- id: 3 - pxeMac: E8:4D:D0:BA:64:45 - ipmiIp: 172.16.131.13 - ipmiUser: root - ipmiPass: Huawei@123 -- id: 4 - pxeMac: E8:4D:D0:BA:63:81 - ipmiIp: 172.16.131.14 - ipmiUser: root - ipmiPass: Huawei@123 -- id: 5 - pxeMac: E8:4D:D0:BA:5F:B5 - ipmiIp: 172.16.131.15 - ipmiUser: root - ipmiPass: Huawei@123 - - -# Adding the Fuel node as node id 6 which may not be correct - please -# adjust as needed. -- id: 6 - libvirtName: fuel-opnfv-1 - libvirtTemplate: templates/hardware_environment/vms/ericsson_montreal_lab/fuel.xml - isFuel: yes - username: root - password: r00tme - -disks: - fuel: 100G -- cgit 1.2.3-korg