diff options
author | 2017-09-22 20:33:38 +0200 | |
---|---|---|
committer | 2017-09-24 23:06:32 +0000 | |
commit | f431509110f5c820a5b458e61d086d2fcc61a83a (patch) | |
tree | de50ccb9b12f6b15dae7305c54090d9722bf8312 /labs/intel/virtual_kvm | |
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/intel/virtual_kvm')
-rw-r--r-- | labs/intel/virtual_kvm/common/config/.gitkeep | 0 | ||||
-rw-r--r-- | labs/intel/virtual_kvm/common/scripts/.gitkeep | 0 | ||||
-rw-r--r-- | labs/intel/virtual_kvm/fuel/config/dea-pod-override.yaml | 254 | ||||
-rw-r--r-- | labs/intel/virtual_kvm/fuel/config/dha.yaml | 64 | ||||
-rw-r--r-- | labs/intel/virtual_kvm/fuel/scripts/.gitkeep | 0 |
5 files changed, 0 insertions, 318 deletions
diff --git a/labs/intel/virtual_kvm/common/config/.gitkeep b/labs/intel/virtual_kvm/common/config/.gitkeep deleted file mode 100644 index e69de29..0000000 --- a/labs/intel/virtual_kvm/common/config/.gitkeep +++ /dev/null diff --git a/labs/intel/virtual_kvm/common/scripts/.gitkeep b/labs/intel/virtual_kvm/common/scripts/.gitkeep deleted file mode 100644 index e69de29..0000000 --- a/labs/intel/virtual_kvm/common/scripts/.gitkeep +++ /dev/null diff --git a/labs/intel/virtual_kvm/fuel/config/dea-pod-override.yaml b/labs/intel/virtual_kvm/fuel/config/dea-pod-override.yaml deleted file mode 100644 index 6a47c34..0000000 --- a/labs/intel/virtual_kvm/fuel/config/dea-pod-override.yaml +++ /dev/null @@ -1,254 +0,0 @@ -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# 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 Intel-1_virtual_deployment' - version: '0.2' - created: 'Tue Jun 14 2016' - comment: 'Rebased for Fuel 9' -environment: - name: opnfv_virt -interfaces_1: - ens3: - - fuelweb_admin - - storage - ens4: - - management - ens5: - - private - ens6: - - public -interfaces_vlan: - ens3: - - fuelweb_admin - - storage - ens4: - - management - ens5: - - private - ens6: - - public -interfaces_dpdk: - ens3: - - fuelweb_admin - - storage - ens4: - - management - ens5: - - private - - interface_properties: - dpdk: - enabled: - value: true - ens6: - - public -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: 8.8.8.8 - HOSTNAME: fuel - NTP1: 188.126.88.9 - NTP2: 193.228.143.12 - NTP3: 178.73.198.130 -network: - networking_parameters: - base_mac: fa:16:3e:00:00:00 - configuration_template: null - dns_nameservers: - - 8.8.8.8 - floating_name: admin_floating_net - floating_ranges: - - - 172.16.0.130 - - 172.16.0.254 - 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.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.0.0/24 - gateway: null - ip_ranges: - - - 192.168.0.1 - - 192.168.0.253 - meta: - cidr: 192.168.0.0/24 - configurable: true - map_priority: 2 - name: management - notation: ip_ranges - render_addr_mask: internal - render_type: cidr - use_gateway: false - vips: - - haproxy - - vrouter - vlan_start: null - name: management - vlan_start: null - - 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: 172.16.0.0/24 - gateway: 172.16.0.1 - ip_ranges: - - - 172.16.0.2 - - 172.16.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: null - - 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: - - 188.126.88.9 - - 193.228.143.12 - - 178.73.198.130 - 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/intel/virtual_kvm/fuel/config/dha.yaml b/labs/intel/virtual_kvm/fuel/config/dha.yaml deleted file mode 100644 index 85333b3..0000000 --- a/labs/intel/virtual_kvm/fuel/config/dha.yaml +++ /dev/null @@ -1,64 +0,0 @@ -dha-pod-config-metadata: - title: Deployment Hardware Adapter (DHA) for Intel Lab, virtual-kvm environment - version: 0.0.2 - created: Feb 2 2016 - comment: Config for Intel Lab, virtual-kvm environment - -# Adapter to use for this definition -adapter: libvirt - -# Node list. -# Mandatory property is id, all other properties are adapter specific. - -nodes: -- id: 1 - libvirtName: controller1 - libvirtTemplate: templates/virtual_environment/vms/controller.xml -- id: 2 - libvirtName: compute1 - libvirtTemplate: templates/virtual_environment/vms/compute.xml -- id: 3 - libvirtName: compute2 - libvirtTemplate: templates/virtual_environment/vms/compute.xml -- id: 4 - libvirtName: compute3 - libvirtTemplate: templates/virtual_environment/vms/compute.xml -- id: 5 - libvirtName: fuel-master - libvirtTemplate: templates/virtual_environment/vms/fuel.xml - isFuel: yes - username: root - password: r00tme - -virtNetConfDir: templates/virtual_environment/networks - -disks: - fuel: 100G - controller: 100G - compute: 100G - -# Here the infrastructure VMs can be defined. -# The entries are not mandatory! If it is left empty -# the default defined in deploy/templates will -# be used. -define_vms: - controller: - vcpu: - value: 8 - memory: - attribute_equlas: - unit: KiB - value: 12582912 - currentMemory: - attribute_equlas: - unit: KiB - value: 12582912 - compute: - memory: - attribute_equlas: - unit: KiB - value: 6291456 - currentMemory: - attribute_equlas: - unit: KiB - value: 6291456 diff --git a/labs/intel/virtual_kvm/fuel/scripts/.gitkeep b/labs/intel/virtual_kvm/fuel/scripts/.gitkeep deleted file mode 100644 index e69de29..0000000 --- a/labs/intel/virtual_kvm/fuel/scripts/.gitkeep +++ /dev/null |