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/pod3/fuel | |
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/pod3/fuel')
-rw-r--r-- | labs/zte/pod3/fuel/config/dea-pod-override.yaml | 259 | ||||
-rw-r--r-- | labs/zte/pod3/fuel/config/dha.yaml | 59 |
2 files changed, 0 insertions, 318 deletions
diff --git a/labs/zte/pod3/fuel/config/dea-pod-override.yaml b/labs/zte/pod3/fuel/config/dea-pod-override.yaml deleted file mode 100644 index df22225..0000000 --- a/labs/zte/pod3/fuel/config/dea-pod-override.yaml +++ /dev/null @@ -1,259 +0,0 @@ -############################################################################## -## Copyright (c) 2016 ZTE Corporation -## zhang.jun3g@zte.com.cn -## 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 for ZTE-POD3' - version: '0.1' - created: 'Jul 16 2016' - comment: 'Rebased for Fuel 9' -environment: - name: zte-pod3 - net_segment_type: vlan -interfaces_1: - enp2s0f0: - - fuelweb_admin - enp2s0f1: - - management - enp132s0f0: - - storage - enp132s0f1: - - private - - 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-prv - provider: ovs - - action: add-br - name: br-aux - - action: add-patch - bridges: - - br-prv - - br-aux - mtu: 65000 - provider: ovs - - action: add-port - bridge: br-storage - name: enp132s0f0.102 - - action: add-port - bridge: br-aux - name: enp132s0f1 - - action: add-port - bridge: br-ex - name: enp132s0f1.103 - - action: add-port - bridge: br-fw-admin - name: enp2s0f0 - - action: add-port - bridge: br-mgmt - name: enp2s0f1.101 -fuel: - ADMIN_NETWORK: - dhcp_pool_end: 10.20.0.200 - dhcp_pool_start: 10.20.0.10 - ipaddress: 10.20.0.2 - netmask: 255.255.255.0 - DNS_DOMAIN: zte.com.cn - DNS_SEARCH: zte.com.cn - DNS_UPSTREAM: 172.10.0.1 - HOSTNAME: fuel - NTP1: 172.10.0.1 - NTP2: '' - NTP3: '' -network: - management_vip: 192.168.11.2 - management_vrouter_vip: 192.168.11.1 - 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.10.0.130 - - 172.10.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: vlan - vlan_range: - - 1000 - - 1030 - networks: - - cidr: 172.10.0.0/24 - gateway: 172.10.0.1 - group_id: 4 - id: 14 - ip_ranges: - - - 172.10.0.10 - - 172.10.0.126 - name: public - vlan_start: 103 - - cidr: 192.168.12.0/24 - gateway: null - group_id: 4 - id: 16 - ip_ranges: - - - 192.168.12.1 - - 192.168.12.254 - name: storage - vlan_start: 102 - - cidr: 192.168.11.0/24 - gateway: null - group_id: 4 - id: 15 - ip_ranges: - - - 192.168.11.1 - - 192.168.11.254 - name: management - vlan_start: 101 - - cidr: null - gateway: null - group_id: 4 - id: 17 - ip_ranges: [] - name: private - vlan_start: null - - cidr: 10.20.0.0/24 - gateway: 10.20.0.2 - group_id: null - id: 1 - ip_ranges: - - - 10.20.0.10 - - 10.20.0.200 - name: fuelweb_admin - vlan_start: null - public_vip: 172.10.0.11 - public_vrouter_vip: 172.10.0.10 - vips: - management: - ipaddr: 192.168.11.2 - is_user_defined: false - namespace: haproxy - network_role: mgmt/vip - node_roles: - - controller - - primary-controller - vendor_specific: null - public: - ipaddr: 172.10.0.11 - is_user_defined: false - namespace: haproxy - network_role: public/vip - node_roles: - - controller - - primary-controller - vendor_specific: null - vrouter: - ipaddr: 192.168.11.1 - is_user_defined: false - namespace: vrouter - network_role: mgmt/vip - node_roles: - - controller - - primary-controller - vendor_specific: null - vrouter_pub: - ipaddr: 172.10.0.10 - is_user_defined: false - namespace: vrouter - network_role: public/vip - node_roles: - - controller - - primary-controller - vendor_specific: - iptables_rules: - ns_start: - - iptables -t nat -A POSTROUTING -o <%INT%> -j MASQUERADE - ns_stop: - - iptables -t nat -D POSTROUTING -o <%INT%> -j MASQUERADE -settings: - editable: - additional_components: - ceilometer: - description: If selected, Ceilometer and Aodh components will be installed - label: Install Ceilometer and Aodh - type: checkbox - value: true - weight: 60 - common: - debug: - description: Debug logging mode provides more information, but requires more - disk space. - group: logging - label: OpenStack debug logging - type: checkbox - value: true - weight: 20 - libvirt_type: - group: compute - label: Hypervisor type - type: radio - value: kvm - values: - - data: kvm - description: Choose this type of hypervisor if you run OpenStack on hardware - label: KVM - - data: qemu - description: Choose this type of hypervisor if you run OpenStack on virtual - hosts. - label: QEMU - weight: 30 - 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: - - 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 - label: NTP server list - regex: - error: Invalid NTP server - source: ^[a-zA-Z\d]+[-\.\da-zA-Z]*$ - type: text_list - value: - - 172.10.0.1 - weight: 10 diff --git a/labs/zte/pod3/fuel/config/dha.yaml b/labs/zte/pod3/fuel/config/dha.yaml deleted file mode 100644 index 470d183..0000000 --- a/labs/zte/pod3/fuel/config/dha.yaml +++ /dev/null @@ -1,59 +0,0 @@ -############################################################################## -### Copyright (c) 2016 ZTE Corporation -### zhang.jun3g@zte.com.cn -### 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 -############################################################################## - -dha-pod-config-metadata: - title: Deployment Hardware Adapter (DHA) for ZTE POD3 - version: 0.0.3 - created: Jul 16 2016 - comment: Default Fuel9 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:0b:85 - ipmiIp: 192.168.1.32 - ipmiUser: zteroot - ipmiPass: superuser -- id: 2 - pxeMac: 74:4a:a4:00:5c:5d - ipmiIp: 192.168.1.33 - ipmiUser: zteroot - ipmiPass: superuser -- id: 3 - pxeMac: 74:4a:a4:00:5c:35 - ipmiIp: 192.168.1.34 - ipmiUser: zteroot - ipmiPass: superuser -- id: 4 - pxeMac: 74:4a:a4:00:5c:69 - ipmiIp: 192.168.1.35 - ipmiUser: zteroot - ipmiPass: superuser -- id: 5 - pxeMac: 74:4a:a4:00:5c:6d - ipmiIp: 192.168.1.36 - 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-pod3 - libvirtTemplate: templates/hardware_environment/vms/fuel.xml - isFuel: yes - username: root - password: r00tme - -disks: - fuel: 100G |