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/ericsson/pod1 | |
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/ericsson/pod1')
-rw-r--r-- | labs/ericsson/pod1/common/scripts/.gitkeep | 0 | ||||
-rw-r--r-- | labs/ericsson/pod1/fuel/config/.gitkeep | 0 | ||||
-rw-r--r-- | labs/ericsson/pod1/fuel/config/dea-pod-override.yaml | 243 | ||||
-rw-r--r-- | labs/ericsson/pod1/fuel/config/dha.yaml | 51 | ||||
-rw-r--r-- | labs/ericsson/pod1/fuel/scripts/.gitkeep | 0 |
5 files changed, 0 insertions, 294 deletions
diff --git a/labs/ericsson/pod1/common/scripts/.gitkeep b/labs/ericsson/pod1/common/scripts/.gitkeep deleted file mode 100644 index e69de29..0000000 --- a/labs/ericsson/pod1/common/scripts/.gitkeep +++ /dev/null diff --git a/labs/ericsson/pod1/fuel/config/.gitkeep b/labs/ericsson/pod1/fuel/config/.gitkeep deleted file mode 100644 index e69de29..0000000 --- a/labs/ericsson/pod1/fuel/config/.gitkeep +++ /dev/null diff --git a/labs/ericsson/pod1/fuel/config/dea-pod-override.yaml b/labs/ericsson/pod1/fuel/config/dea-pod-override.yaml deleted file mode 100644 index df97f5c..0000000 --- a/labs/ericsson/pod1/fuel/config/dea-pod-override.yaml +++ /dev/null @@ -1,243 +0,0 @@ -dea-pod-override-config-metadata: - title: 'Deployment Environment Adapter POD override for Ericsson, POD1' -# DEA API version supported - version: '0.2' - created: 'Mon Dec 12 2016' - comment: '' -environment: - name: ERICSSON-POD1 -interfaces_1: - eno1: - - fuelweb_admin - ens2f0: - - public - - management - - storage - ens2f1: - - private -interfaces_vlan: - eno1: - - fuelweb_admin - ens2f0: - - public - - management - - storage - ens2f1: - - private -interfaces_dpdk: - eno1: - - fuelweb_admin - ens2f0: - - public - - management - - storage - ens2f1: - - private - - interface_properties: - dpdk: - enabled: - value: true - -fuel: - ADMIN_NETWORK: - dhcp_pool_end: 10.20.0.254 - dhcp_pool_start: 10.20.0.12 - 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-pod1 - 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.4.4 - - 8.8.8.8 - floating_name: admin_floating_net - floating_ranges: - - - 100.64.200.30 - - 100.64.200.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: 100.64.200.0/24 - gateway: 100.64.200.1 - ip_ranges: - - - 100.64.200.10 - - 100.64.200.29 - 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: 80 - - cidr: 192.168.20.0/24 - gateway: null - ip_ranges: - - - 192.168.20.12 - - 192.168.20.254 - meta: - cidr: 192.168.1.0/24 - configurable: true - map_priority: 2 - name: storage - notation: ip_ranges - render_addr_mask: storage - render_type: cidr - use_gateway: false - vlan_start: 82 - name: storage - vlan_start: 82 - - cidr: 192.168.10.0/24 - gateway: null - ip_ranges: - - - 192.168.10.12 - - 192.168.10.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: 81 - name: management - vlan_start: 81 - - 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: 1000 - name: private - vlan_start: 1000 - - cidr: 10.20.0.0/24 - gateway: 10.20.0.2 - ip_ranges: - - - 10.20.0.12 - - 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/pod1/fuel/config/dha.yaml b/labs/ericsson/pod1/fuel/config/dha.yaml deleted file mode 100644 index d935f9e..0000000 --- a/labs/ericsson/pod1/fuel/config/dha.yaml +++ /dev/null @@ -1,51 +0,0 @@ -dha-pod-config-metadata: - title: Deployment Hardware Adapter (DHA) for Ericsson, POD1 -# DHA API version supported - version: 0.0.1 - created: Jan 12 2016 - comment: Config for Ericsson Montreal Lab, POD1 - -# Adapter to use for this definition -adapter: hp - -# Node list. -# Mandatory property is id, all other properties are adapter specific. - -nodes: - -- id: 1 - pxeMac: 14:58:D0:54:E7:88 - ipmiIp: 172.16.1.16 - ipmiUser: opnfv - ipmiPass: Winter2017 -- id: 2 - pxeMac: 14:58:D0:54:6A:60 - ipmiIp: 172.16.1.17 - ipmiUser: opnfv - ipmiPass: Winter2017 -- id: 3 - pxeMac: 14:58:D0:54:7A:28 - ipmiIp: 172.16.1.18 - ipmiUser: opnfv - ipmiPass: Winter2017 -- id: 4 - pxeMac: 9C:B6:54:8A:95:A0 - ipmiIp: 172.16.1.19 - ipmiUser: opnfv - ipmiPass: Winter2017 -- id: 5 - pxeMac: 9C:B6:54:8A:10:18 - ipmiIp: 172.16.1.20 - ipmiUser: opnfv - ipmiPass: Winter2017 -- id: 6 - libvirtName: fuel-opnfv - libvirtTemplate: templates/hardware_environment/vms/ericsson_montreal_lab/fuel.xml - isFuel: yes - username: root - password: r00tme - -disks: - compute: 40G - controller: 40G - fuel: 60G diff --git a/labs/ericsson/pod1/fuel/scripts/.gitkeep b/labs/ericsson/pod1/fuel/scripts/.gitkeep deleted file mode 100644 index e69de29..0000000 --- a/labs/ericsson/pod1/fuel/scripts/.gitkeep +++ /dev/null |