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>

36 files changed, 0 insertions, 5851 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
diff --git a/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml b/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml
deleted file mode 100644
index c722edb..0000000
--- a/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml
+++ /dev/null
@@ -1,242 +0,0 @@
-dea-pod-override-config-metadata:
-  title: 'Deployment Environment Adapter POD override for ERICSSON-POD2'
-# DEA API version supported
-  version: '0.2'
-  created: 'Mon Dec 12 2016'
-  comment: ''
-environment:
-  name: ERICSSON-POD2
-interfaces_1:
-  eno49:
-  - fuelweb_admin
-  ens2f0:
-  - public
-  - management
-  - storage
-  ens2f1:
-  - private
-interfaces_vlan:
-  eno49:
-  - fuelweb_admin
-  ens2f0:
-  - public
-  - management
-  - storage
-  ens2f1:
-  - private
-interfaces_dpdk:
-  eno49:
-  - 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.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-pod2
-  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.8
-    floating_name: admin_floating_net
-    floating_ranges:
-    - - 100.64.201.30
-      - 100.64.201.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:
-    - 3010
-    - 3040
-  networks:
-  - cidr: 100.64.201.0/24
-    gateway: 100.64.201.1
-    ip_ranges:
-    - - 100.64.201.10
-      - 100.64.201.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: 84
-    name: public
-    vlan_start: 84
-  - cidr: 192.168.20.0/24
-    gateway: null
-    ip_ranges:
-    - - 192.168.20.1
-      - 192.168.20.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: 86
-    name: storage
-    vlan_start: 86
-  - 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: 85
-    name: management
-    vlan_start: 85
-  - cidr: 192.168.30.0/24
-    gateway: null
-    ip_ranges:
-    - - 192.168.30.1
-      - 192.168.30.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: 3010
-    name: private
-    vlan_start: 3010
-  - 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/pod2/fuel/config/dha.yaml b/labs/ericsson/pod2/fuel/config/dha.yaml
deleted file mode 100644
index ebe9d1a..0000000
--- a/labs/ericsson/pod2/fuel/config/dha.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-dha-pod-config-metadata:
-  title: Deployment Hardware Adapter (DHA) for Ericsson-1, POD-2
-# DHA API version supported
-  version: 0.0.3
-  created: Feb 1 2016
-  comment: Config for Ericsson Montreal Lab 1, POD2, Rebased for Fuel8
-
-# Adapter to use for this definition
-adapter: hp
-
-# Node list.
-# Mandatory properties are id and role.
-
-nodes:
-
-- id: 1
-  pxeMac: EC:B1:D7:A2:44:A0
-  ipmiIp: 172.16.2.12
-  ipmiUser: opnfv
-  ipmiPass: Winter2017
-- id: 2
-  pxeMac: EC:B1:D7:A2:44:80
-  ipmiIp: 172.16.2.13
-  ipmiUser: opnfv
-  ipmiPass: Winter2017
-- id: 3
-  pxeMac: EC:B1:D7:A2:43:C0
-  ipmiIp: 172.16.2.14
-  ipmiUser: opnfv
-  ipmiPass: Winter2017
-- id: 4
-  pxeMac: EC:B1:D7:A1:8B:D0
-  ipmiIp: 172.16.2.15
-  ipmiUser: opnfv
-  ipmiPass: Winter2017
-- id: 5
-  pxeMac: EC:B1:D7:A1:BD:60
-  ipmiIp: 172.16.2.16
-  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: 100G
-  controller: 100G
-  fuel: 100G
diff --git a/labs/ericsson/pod2/fuel/reap/dea.yaml b/labs/ericsson/pod2/fuel/reap/dea.yaml
deleted file mode 100644
index 1ce7308..0000000
--- a/labs/ericsson/pod2/fuel/reap/dea.yaml
+++ /dev/null
@@ -1,1073 +0,0 @@
-
-title: Deployment Environment Adapter (DEA)
-# DEA API version supported
-version: 1.1
-created: Mon Jun 13 19:39:35 2016
-comment: None
-environment:
-  name: F9-NOSDN-NOFEATURE-VXLAN-BAREMETAL
-  net_segment_type: tun
-wanted_release: Mitaka on Ubuntu 14.04
-nodes:
-- id: 1
-  interfaces: interfaces_1
-  role: ceph-osd,controller
-  transformations: transformations_1
-- id: 2
-  interfaces: interfaces_1
-  role: ceph-osd,controller
-  transformations: transformations_1
-- id: 3
-  interfaces: interfaces_1
-  role: ceph-osd,controller
-  transformations: transformations_1
-- id: 4
-  interfaces: interfaces_1
-  role: compute
-  transformations: transformations_1
-- id: 5
-  interfaces: interfaces_1
-  role: compute
-  transformations: transformations_1
-interfaces_1:
-  eno49:
-  - fuelweb_admin
-  ens1f0:
-  - public
-  - management
-  - storage
-  - private
-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: eno49
-  - action: add-port
-    bridge: br-mgmt
-    name: ens1f0.100
-  - action: add-port
-    bridge: br-storage
-    name: ens1f0.200
-  - action: add-port
-    bridge: br-ex
-    name: ens1f0.753
-  - action: add-port
-    bridge: br-mesh
-    name: ens1f0.300
-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: 10.20.0.0/24
-  DNS_DOMAIN: opnfvericsson.ca
-  DNS_SEARCH: opnfvericsson.ca
-  DNS_UPSTREAM: 10.118.32.193
-  FUEL_ACCESS:
-    password: admin
-    user: admin
-  HOSTNAME: fuel-pod2-bm
-  NTP1: 10.118.32.193
-  NTP2: ''
-  NTP3: ''
-network:
-  networking_parameters:
-    base_mac: fa:16:3e:00:00:00
-    configuration_template: null
-    dns_nameservers:
-    - 10.118.32.193
-    floating_name: admin_floating_net
-    floating_ranges:
-    - - 10.118.101.171
-      - 10.118.101.180
-    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: 10.118.101.0/24
-    gateway: 10.118.101.1
-    ip_ranges:
-    - - 10.118.101.160
-      - 10.118.101.170
-    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: 753
-  - cidr: 192.168.20.0/24
-    gateway: null
-    ip_ranges:
-    - - 192.168.20.1
-      - 192.168.20.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: 200
-  - cidr: 192.168.10.0/24
-    gateway: null
-    ip_ranges:
-    - - 192.168.10.1
-      - 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: 101
-    name: management
-    vlan_start: 100
-  - cidr: 192.168.30.0/24
-    gateway: null
-    ip_ranges:
-    - - 192.168.30.1
-      - 192.168.30.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: 300
-  - 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:
-    access:
-      email:
-        description: Email address for Administrator
-        label: Email
-        regex:
-          error: Invalid email
-          source: ^\S+@\S+$
-        type: text
-        value: admin@localhost
-        weight: 40
-      metadata:
-        group: general
-        label: OpenStack Access
-        weight: 10
-      password:
-        description: Password for Administrator
-        label: Password
-        regex:
-          error: Empty password
-          source: \S
-        type: password
-        value: admin
-        weight: 20
-      tenant:
-        description: Tenant (project) name for Administrator
-        label: Tenant
-        regex:
-          error: Invalid tenant name
-          source: ^(?!services$)(?!nova$)(?!glance$)(?!keystone$)(?!neutron$)(?!cinder$)(?!swift$)(?!ceph$)(?!ironic$)(?![Gg]uest$)(?!.*
-            +.*$).+
-        type: text
-        value: admin
-        weight: 30
-      user:
-        description: Username for Administrator
-        label: Username
-        regex:
-          error: Invalid username
-          source: ^(?!services$)(?!nova$)(?!glance$)(?!keystone$)(?!neutron$)(?!cinder$)(?!swift$)(?!ceph$)(?!ironic$)(?![Gg]uest$)(?!.*
-            +.*$).+
-        type: text
-        value: admin
-        weight: 10
-    additional_components:
-      ceilometer:
-        description: If selected, Ceilometer and Aodh components will be installed
-        label: Install Ceilometer and Aodh
-        type: checkbox
-        value: false
-        weight: 60
-      heat:
-        description: ''
-        label: ''
-        type: hidden
-        value: true
-        weight: 50
-      ironic:
-        description: If selected, Ironic component will be installed
-        label: Install Ironic
-        restrictions:
-        - cluster:net_provider != 'neutron' or networking_parameters:segmentation_type != 'vlan': Ironic
-            requires Neutron with VLAN segmentation.
-        - settings:storage.images_ceph.value == true and settings:storage.objects_ceph.value == false: Ironic
-            requires Swift or RadosGW for Glance images.
-        type: checkbox
-        value: false
-        weight: 80
-      metadata:
-        group: openstack_services
-        label: Additional Components
-        weight: 10
-      mongo:
-        description: If selected, You can use external Mongo DB as ceilometer backend
-        label: Use external Mongo DB
-        restrictions:
-        - settings:additional_components.ceilometer.value == false: External Mongo
-            aims to be an external backend for Ceilometer. Without Ceilometer enabled,
-            External Mongo is useless and should not be installed.
-        type: checkbox
-        value: false
-        weight: 70
-      murano:
-        description: If selected, Murano component will be installed
-        label: Install Murano
-        type: checkbox
-        value: false
-        weight: 20
-      murano-cfapi:
-        description: If selected, Murano service broker will be installed
-        label: Install Murano service broker for Cloud Foundry
-        restrictions:
-        - condition: settings:additional_components.murano.value == false
-          message: Murano should be enabled
-        - action: hide
-          condition: not ('experimental' in version:feature_groups)
-        type: checkbox
-        value: false
-        weight: 30
-      sahara:
-        description: If selected, Sahara component will be installed
-        label: Install Sahara
-        type: checkbox
-        value: false
-        weight: 10
-    cgroups:
-      metadata:
-        always_editable: true
-        group: general
-        label: Cgroups conguration for services
-        restrictions:
-        - action: hide
-          condition: 'true'
-        weight: 90
-    common:
-      auth_key:
-        group: security
-        type: hidden
-        value: ''
-        weight: 70
-      auto_assign_floating_ip:
-        description: If selected, OpenStack will automatically assign a floating IP
-          to a new instance
-        group: network
-        label: Auto assign floating IP
-        restrictions:
-        - action: hide
-          condition: cluster:net_provider == 'neutron'
-        type: checkbox
-        value: false
-        weight: 40
-      debug:
-        description: Debug logging mode provides more information, but requires more
-          disk space.
-        group: logging
-        label: OpenStack debug logging
-        type: checkbox
-        value: false
-        weight: 20
-      libvirt_type:
-        group: compute
-        label: Hypervisor type
-        type: radio
-        value: qemu
-        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
-      metadata:
-        label: Common
-        weight: 10
-      nova_quota:
-        description: Quotas are used to limit CPU and memory usage for tenants. Enabling
-          quotas will increase load on the Nova database.
-        group: compute
-        label: Nova quotas
-        type: checkbox
-        value: false
-        weight: 30
-      propagate_task_deploy:
-        type: hidden
-        value: false
-        weight: 12
-      puppet_debug:
-        description: Debug puppet logging mode provides more information, but requires
-          more disk space.
-        group: logging
-        label: Puppet debug logging
-        type: checkbox
-        value: true
-        weight: 20
-      resume_guests_state_on_host_boot:
-        description: Whether to resume previous guests state when the host reboots.
-          If enabled, this option causes guests assigned to the host to resume their
-          previous state. If the guest was running a restart will be attempted when
-          nova-compute starts. If the guest was not running previously, a restart
-          will not be attempted.
-        group: compute
-        label: Resume guests state on host boot
-        type: checkbox
-        value: true
-        weight: 50
-      task_deploy:
-        type: hidden
-        value: true
-        weight: 11
-      use_cow_images:
-        description: For most cases you will want qcow format. If it's disabled, raw
-          image format will be used to run VMs. OpenStack with raw format currently
-          does not support snapshotting.
-        group: storage
-        label: Use qcow format for images
-        type: checkbox
-        value: true
-        weight: 60
-      use_vcenter:
-        type: hidden
-        value: false
-        weight: 30
-    corosync:
-      group:
-        description: ''
-        label: Group
-        type: text
-        value: 226.94.1.1
-        weight: 10
-      metadata:
-        group: general
-        label: Corosync
-        restrictions:
-        - action: hide
-          condition: 'true'
-        weight: 50
-      port:
-        description: ''
-        label: Port
-        type: text
-        value: '12000'
-        weight: 20
-      verified:
-        description: Set True only if multicast is configured correctly on router.
-        label: Need to pass network verification.
-        type: checkbox
-        value: false
-        weight: 10
-    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:
-        - 10.118.32.193
-        weight: 10
-      metadata:
-        group: network
-        label: Host OS DNS Servers
-        weight: 30
-    external_mongo:
-      hosts_ip:
-        description: IP Addresses of MongoDB. Use comma to split IPs
-        label: MongoDB hosts IP
-        regex:
-          error: Invalid hosts ip sequence
-          source: ^(((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?),)*((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$
-        type: text
-        value: ''
-        weight: 30
-      metadata:
-        group: openstack_services
-        label: External MongoDB
-        restrictions:
-        - action: hide
-          condition: settings:additional_components.mongo.value == false
-          message: Ceilometer and MongoDB are not enabled on the Additional Components
-            section
-        weight: 30
-      mongo_db_name:
-        description: Mongo database name
-        label: Database name
-        regex:
-          error: Invalid database name
-          source: ^\w+$
-        type: text
-        value: ceilometer
-        weight: 30
-      mongo_password:
-        description: Mongo database password
-        label: Password
-        regex:
-          error: Password contains spaces
-          source: ^\S*$
-        type: password
-        value: ceilometer
-        weight: 30
-      mongo_replset:
-        description: Name for Mongo replication set
-        label: Replset
-        type: text
-        value: ''
-        weight: 30
-      mongo_user:
-        description: Mongo database username
-        label: Username
-        regex:
-          error: Empty username
-          source: ^\w+$
-        type: text
-        value: ceilometer
-        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:
-        - 10.118.32.193
-        weight: 10
-    kernel_params:
-      kernel:
-        description: Default kernel parameters
-        label: Initial parameters
-        type: text
-        value: console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90 nomodeset
-      metadata:
-        group: general
-        label: Kernel parameters
-        weight: 60
-    murano_settings:
-      metadata:
-        group: openstack_services
-        label: Murano Settings
-        restrictions:
-        - action: hide
-          condition: settings:additional_components.murano.value == false
-          message: Murano is not enabled on the Additional Components section
-        weight: 20
-      murano_glance_artifacts_plugin:
-        description: If selected glance artifact repository will be enabled
-        label: Enable glance artifact repository
-        type: checkbox
-        value: true
-        weight: 40
-      murano_repo_url:
-        description: ''
-        label: Murano Repository URL
-        type: text
-        value: http://storage.apps.openstack.org/
-        weight: 10
-    neutron_advanced_configuration:
-      metadata:
-        group: network
-        label: Neutron Advanced Configuration
-        restrictions:
-        - action: hide
-          condition: cluster:net_provider != 'neutron'
-        weight: 20
-      neutron_dvr:
-        description: Enable Distributed Virtual Routers in Neutron
-        label: Neutron DVR
-        restrictions:
-        - ? networking_parameters:segmentation_type != 'vlan' and settings:neutron_advanced_configuration.neutron_l2_pop.value
-            == false
-          : DVR requires L2 population to be enabled.
-        type: checkbox
-        value: false
-        weight: 20
-      neutron_l2_pop:
-        description: Enable L2 population mechanism in Neutron
-        label: Neutron L2 population
-        restrictions:
-        - action: hide
-          condition: networking_parameters:segmentation_type == 'vlan'
-        type: checkbox
-        value: false
-        weight: 10
-      neutron_l3_ha:
-        description: 'Enable High Availability features for Virtual Routers in Neutron
-
-          Requires at least 2 Controller nodes to function properly
-
-          '
-        label: Neutron L3 HA
-        restrictions:
-        - condition: settings:neutron_advanced_configuration.neutron_dvr.value ==
-            true
-          message: Neutron DVR must be disabled in order to use Neutron L3 HA
-        type: checkbox
-        value: false
-        weight: 30
-      neutron_qos:
-        description: Enable Neutron QoS advanced service plug-in
-        label: Neutron QoS
-        type: checkbox
-        value: false
-        weight: 40
-    operator_user:
-      authkeys:
-        description: Public SSH keys to include to operator user's authorized keys,
-          one per line.
-        label: Authorized SSH keys
-        type: textarea
-        value: ''
-        weight: 80
-      homedir:
-        description: Home directory for operator user
-        label: Home directory
-        regex:
-          error: Invalid path
-          source: ^/\S
-        type: text
-        value: /home/fueladmin
-        weight: 70
-      metadata:
-        group: general
-        label: Operating System Access
-        weight: 15
-      name:
-        description: Username for operator user
-        label: Username
-        regex:
-          error: Empty username
-          source: \S
-        type: text
-        value: fueladmin
-        weight: 50
-      password:
-        description: Password for operator user
-        label: Password
-        regex:
-          error: Empty password
-          source: \S
-        type: password
-        value: 27rh9GiG6HD3W22wkH1z55Pv
-        weight: 60
-      sudo:
-        description: Sudoers configuration directives for operator user, one per line.
-        label: Sudoers configuration
-        type: textarea
-        value: 'ALL=(ALL) NOPASSWD: ALL'
-        weight: 90
-    provision:
-      metadata:
-        group: general
-        label: Provision
-        restrictions:
-        - action: hide
-          condition: 'false'
-        weight: 80
-      method:
-        type: hidden
-        value: image
-      packages:
-        label: Initial packages
-        type: textarea
-        value: 'acl
-
-          anacron
-
-          bash-completion
-
-          bridge-utils
-
-          bsdmainutils
-
-          build-essential
-
-          cloud-init
-
-          curl
-
-          daemonize
-
-          debconf-utils
-
-          gdisk
-
-          grub-pc
-
-          hpsa-dkms
-
-          hwloc
-
-          i40e-dkms
-
-          linux-firmware
-
-          linux-firmware-nonfree
-
-          linux-headers-generic-lts-trusty
-
-          linux-image-generic-lts-trusty
-
-          lvm2
-
-          mcollective
-
-          mdadm
-
-          multipath-tools
-
-          multipath-tools-boot
-
-          nailgun-agent
-
-          nailgun-mcagents
-
-          network-checker
-
-          ntp
-
-          openssh-client
-
-          openssh-server
-
-          puppet
-
-          python-amqp
-
-          ruby-augeas
-
-          ruby-ipaddress
-
-          ruby-json
-
-          ruby-netaddr
-
-          ruby-openstack
-
-          ruby-shadow
-
-          ruby-stomp
-
-          telnet
-
-          ubuntu-minimal
-
-          ubuntu-standard
-
-          uuid-runtime
-
-          vim
-
-          virt-what
-
-          vlan
-
-          '
-        weight: 10
-    public_network_assignment:
-      assign_to_all_nodes:
-        description: When disabled, public network will be assigned to controllers
-          only
-        label: Assign public network to all nodes
-        type: checkbox
-        value: true
-        weight: 10
-      metadata:
-        group: network
-        label: Public network assignment
-        restrictions:
-        - action: hide
-          condition: cluster:net_provider != 'neutron'
-        weight: 10
-    public_ssl:
-      cert_data:
-        description: Certificate and private key data, concatenated into a single
-          file
-        label: Certificate
-        restrictions:
-        - action: hide
-          condition: (settings:public_ssl.cert_source.value != 'user_uploaded') or
-            (settings:public_ssl.horizon.value == false and settings:public_ssl.services.value
-            == false)
-        type: file
-        value: ''
-        weight: 40
-      cert_source:
-        description: From where we'll get certificate and private key
-        label: Select source for certificate
-        restrictions:
-        - action: hide
-          condition: settings:public_ssl.horizon.value == false and settings:public_ssl.services.value
-            == false
-        type: radio
-        value: self_signed
-        values:
-        - data: self_signed
-          description: Generate private key and certificate that will be signed by
-            this key
-          label: Self-signed
-        - data: user_uploaded
-          description: Use pre-generated key and certificate
-          label: I have my own keypair with certificate
-        weight: 30
-      horizon:
-        description: Secure access to Horizon enabling HTTPS instead of HTTP
-        label: HTTPS for Horizon
-        restrictions:
-        - settings:public_ssl.services.value == false: TLS for OpenStack public endpoints
-            should be enabled
-        type: checkbox
-        value: false
-        weight: 20
-      hostname:
-        description: Your DNS entries should point to this name. Self-signed certificates
-          also will use this hostname
-        label: DNS hostname for public TLS endpoints
-        restrictions:
-        - action: hide
-          condition: settings:public_ssl.horizon.value == false and settings:public_ssl.services.value
-            == false
-        type: text
-        value: public.fuel.local
-        weight: 50
-      metadata:
-        group: security
-        label: Public TLS
-        weight: 110
-      services:
-        description: Enable TLS termination on HAProxy for OpenStack services
-        label: TLS for OpenStack public endpoints
-        type: checkbox
-        value: false
-        weight: 10
-    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://archive.ubuntu.com/ubuntu/
-        - name: ubuntu-updates
-          priority: null
-          section: main universe multiverse
-          suite: trusty-updates
-          type: deb
-          uri: http://archive.ubuntu.com/ubuntu/
-        - name: ubuntu-security
-          priority: null
-          section: main universe multiverse
-          suite: trusty-security
-          type: deb
-          uri: http://archive.ubuntu.com/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: mos-updates
-          priority: 1050
-          section: main restricted
-          suite: mos9.0-updates
-          type: deb
-          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
-        - name: mos-security
-          priority: 1050
-          section: main restricted
-          suite: mos9.0-security
-          type: deb
-          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
-        - name: mos-holdback
-          priority: 1100
-          section: main restricted
-          suite: mos9.0-holdback
-          type: deb
-          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
-        - name: Auxiliary
-          priority: 1150
-          section: main restricted
-          suite: auxiliary
-          type: deb
-          uri: http://10.20.0.2:8080/mitaka-9.0/ubuntu/auxiliary
-    service_user:
-      homedir:
-        type: hidden
-        value: /var/lib/fuel
-      metadata:
-        group: general
-        label: Service user account
-        restrictions:
-        - action: hide
-          condition: 'true'
-        weight: 10
-      name:
-        type: hidden
-        value: fuel
-      password:
-        type: hidden
-        value: W3sH2BmpXDRFknF1CaKic1qy
-      root_password:
-        type: hidden
-        value: r00tme
-      sudo:
-        type: hidden
-        value: 'ALL=(ALL) NOPASSWD: ALL'
-    storage:
-      admin_key:
-        type: hidden
-        value: AQDa715XAAAAABAA5TxlMb3xdt+n4+dav1DzGQ==
-      bootstrap_osd_key:
-        type: hidden
-        value: AQDa715XAAAAABAAJVlRDU0ViJL7mgww3b8a2Q==
-      ephemeral_ceph:
-        description: Configures Nova to store ephemeral volumes in RBD. This works
-          best if Ceph is enabled for volumes and images, too. Enables live migration
-          of all types of Ceph backed VMs (without this option, live migration will
-          only work with VMs launched from Cinder volumes).
-        label: Ceph RBD for ephemeral volumes (Nova)
-        type: checkbox
-        value: false
-        weight: 75
-      fsid:
-        type: hidden
-        value: 63d2bfc7-c41e-435f-ad30-b13bde259e92
-      images_ceph:
-        description: Configures Glance to use the Ceph RBD backend to store images.
-          If enabled, this option will prevent Swift from installing.
-        label: Ceph RBD for images (Glance)
-        restrictions:
-        - settings:storage.images_vcenter.value == true: Only one Glance backend could
-            be selected.
-        type: checkbox
-        value: false
-        weight: 30
-      images_vcenter:
-        description: Configures Glance to use the vCenter/ESXi backend to store images.
-          If enabled, this option will prevent Swift from installing.
-        label: VMware vCenter/ESXi datastore for images (Glance)
-        restrictions:
-        - action: hide
-          condition: settings:common.use_vcenter.value != true
-        - condition: settings:storage.images_ceph.value == true
-          message: Only one Glance backend could be selected.
-        type: checkbox
-        value: false
-        weight: 35
-      metadata:
-        group: storage
-        label: Storage Backends
-        weight: 60
-      mon_key:
-        type: hidden
-        value: AQDa715XAAAAABAA0pIR9c+Qzp37K6pAI4eGZg==
-      objects_ceph:
-        description: Configures RadosGW front end for Ceph RBD. This exposes S3 and
-          Swift API Interfaces. If enabled, this option will prevent Swift from installing.
-        label: Ceph RadosGW for objects (Swift API)
-        type: checkbox
-        value: false
-        weight: 80
-      osd_pool_size:
-        description: Configures the default number of object replicas in Ceph. This
-          number must be equal to or lower than the number of deployed 'Ceph OSD'
-          nodes.
-        label: Ceph object replication factor
-        regex:
-          error: Invalid number
-          source: ^[1-9]\d*$
-        type: text
-        value: '3'
-        weight: 85
-      radosgw_key:
-        type: hidden
-        value: AQDa715XAAAAABAAvmHlWZf1GcHrc9V5WrrO4w==
-      volumes_block_device:
-        description: High performance block device storage. It is recommended to have
-          at least one Cinder Block Device
-        label: Cinder Block device driver
-        restrictions:
-        - settings:storage.volumes_ceph.value == true
-        type: checkbox
-        value: false
-        weight: 15
-      volumes_ceph:
-        description: Configures Cinder to store volumes in Ceph RBD images.
-        label: Ceph RBD for volumes (Cinder)
-        restrictions:
-        - settings:storage.volumes_lvm.value == true or settings:storage.volumes_block_device.value
-          == true
-        type: checkbox
-        value: true
-        weight: 20
-      volumes_lvm:
-        description: It is recommended to have at least one Cinder node.
-        label: Cinder LVM over iSCSI for volumes
-        restrictions:
-        - settings:storage.volumes_ceph.value == true
-        type: checkbox
-        value: false
-        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
-    workloads_collector:
-      enabled:
-        type: hidden
-        value: true
-      metadata:
-        group: general
-        label: Workloads Collector User
-        restrictions:
-        - action: hide
-          condition: 'true'
-        weight: 10
-      password:
-        type: password
-        value: rPqK6aMcGba6yCD8PSyhPWj8
-      tenant:
-        type: text
-        value: services
-      user:
-        type: text
-        value: fuel_stats_user
diff --git a/labs/ericsson/pod2/fuel/reap/dha.yaml b/labs/ericsson/pod2/fuel/reap/dha.yaml
deleted file mode 100644
index cd0f173..0000000
--- a/labs/ericsson/pod2/fuel/reap/dha.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
-
-title: Deployment Hardware Adapter (DHA)
-# DHA API version supported
-version: 1.1
-created: Mon Jun 13 19:39:35 2016
-comment: None
-
-# Adapter to use for this definition
-# adapter: [ipmi|libvirt]
-adapter:
-
-# 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
-#   - libvirt adapter you need to provide:
-#       libvirtName: <whatever>
-#       libvirtTemplate: [libvirt/vms/controller.xml | libvirt/vms/compute.xml]
-#
-# For the Fuel Node you need to provide:
-#       libvirtName: <whatever>
-#       libvirtTemplate: libvirt/vms/fuel.xml
-#       isFuel: yes
-#       username: root
-#       password: r00tme
-
-nodes:
-- id: 1
-  ipmiIp: null
-  ipmiPass: null
-  ipmiUser: null
-  libvirtName: null
-  libvirtTemplate: null
-  pxeMac: ec:b1:d7:a2:44:80
-- id: 2
-  ipmiIp: null
-  ipmiPass: null
-  ipmiUser: null
-  libvirtName: null
-  libvirtTemplate: null
-  pxeMac: ec:b1:d7:a2:43:c0
-- id: 3
-  ipmiIp: null
-  ipmiPass: null
-  ipmiUser: null
-  libvirtName: null
-  libvirtTemplate: null
-  pxeMac: ec:b1:d7:a1:bd:60
-- id: 4
-  ipmiIp: null
-  ipmiPass: null
-  ipmiUser: null
-  libvirtName: null
-  libvirtTemplate: null
-  pxeMac: ec:b1:d7:a1:8b:d0
-- id: 5
-  ipmiIp: null
-  ipmiPass: null
-  ipmiUser: null
-  libvirtName: null
-  libvirtTemplate: null
-  pxeMac: ec:b1:d7:a2:44:a0
-# Adding the Fuel node as node id 6
-# which may not be correct - please adjust as needed.
-- id: 6
-  isFuel: true
-  libvirtName: null
-  libvirtTemplate: null
-  password: r00tme
-  username: root
-disks:
-  compute: 100G
-  controller: 100G
-  fuel: 100G
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: <whatever>
-#       libvirtTemplate: [libvirt/vms/controller.xml | libvirt/vms/compute.xml]
-#
-# For the Fuel Node you need to provide:
-#       libvirtName: <whatever>
-#       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
diff --git a/labs/ericsson/pod4/fuel/config/dea-pod-override.yaml b/labs/ericsson/pod4/fuel/config/dea-pod-override.yaml
deleted file mode 100644
index a429a5f..0000000
--- a/labs/ericsson/pod4/fuel/config/dea-pod-override.yaml
+++ /dev/null
@@ -1,247 +0,0 @@
-dea-pod-override-config-metadata:
-  title: 'Deployment Environment Adapter POD override for Ericsson-1, POD-2'
-# DEA API version supported
-  version: '0.2'
-  created: 'Tue Jun 14 2016'
-  comment: 'ERICSSON-POD3 - Manual Authoring of File - Daniel Smith'
-environment:
-  name: ERICSSON-POD4
-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
-attributes_1:
-  dpdk:
-    ovs_pmd_core_mask: 1000
-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-pod4
-  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.2.101
-      - 190.10.2.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:
-    - 1020
-    - 1039
-  networks:
-  - cidr: 190.10.2.0/24
-    gateway: 190.10.2.1
-    ip_ranges:
-    - - 190.10.2.15
-      - 190.10.2.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: 206
-  - 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: 207
-  - 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: 209
-  - 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: 1020
-  - 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/pod4/fuel/config/dha.yaml b/labs/ericsson/pod4/fuel/config/dha.yaml
deleted file mode 100644
index bf7c58b..0000000
--- a/labs/ericsson/pod4/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-POD4 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: <whatever>
-#       libvirtTemplate: [libvirt/vms/controller.xml | libvirt/vms/compute.xml]
-#
-# For the Fuel Node you need to provide:
-#       libvirtName: <whatever>
-#       libvirtTemplate: libvirt/vms/fuel.xml
-#       isFuel: yes
-#       username: root
-#       password: r00tme
-
-nodes:
-
-- id: 1
-  ipmiIp: 164.10.1.12
-  ipmiPass: ci_opnfv
-  ipmiUser: opnfv_ci
-  libvirtName: null
-  libvirtTemplate: null
-  pxeMac: ec:b1:d7:9d:9b:f0
-- id: 2
-  ipmiIp: 164.10.1.13
-  ipmiPass: ci_opnfv
-  ipmiUser: opnfv_ci
-  libvirtName: null
-  libvirtTemplate: null
-  pxeMac: ec:b1:d7:9d:98:40
-- id: 3
-  ipmiIp: 164.10.1.15
-  ipmiPass: ci_opnfv
-  ipmiUser: opnfv_ci
-  libvirtName: null
-  libvirtTemplate: null
-  pxeMac: ec:b1:d7:9d:90:f0
-- id: 4
-  ipmiIp: 164.10.1.16
-  ipmiPass: ci_opnfv
-  ipmiUser: opnfv_ci
-  libvirtName: null
-  libvirtTemplate: null
-  pxeMac: ec:b1:d7:9d:92:60
-- id: 5
-  ipmiIp: 164.10.1.17
-  ipmiPass: ci_opnfv
-  ipmiUser: opnfv_ci
-  libvirtName: null
-  libvirtTemplate: null
-  pxeMac: ec:b1:d7:9d:9c:00
-# 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
diff --git a/labs/ericsson/virtual_kvm/common/scripts/.gitkeep b/labs/ericsson/virtual_kvm/common/scripts/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/labs/ericsson/virtual_kvm/common/scripts/.gitkeep
+++ /dev/null
diff --git a/labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml b/labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml
deleted file mode 100644
index 79eaa51..0000000
--- a/labs/ericsson/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 Ericsson Rosersberg vPODs'
-  version: '0.2'
-  created: 'Wed Sep 21 2016'
-  comment: 'Created for Ericsson Lab Migration'
-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/ericsson/virtual_kvm/fuel/config/dha.yaml b/labs/ericsson/virtual_kvm/fuel/config/dha.yaml
deleted file mode 100644
index 26260cb..0000000
--- a/labs/ericsson/virtual_kvm/fuel/config/dha.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-dha-pod-config-metadata:
-  title: Deployment Hardware Adapter (DHA) for Ericsson Lab, virtual-kvm environment
-  version: 0.0.2
-  created: Feb 1 2016
-  comment: Config for Ericsson Montreal 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: 14680064
-    currentMemory:
-      attribute_equlas:
-        unit: KiB
-      value: 14680064
-  compute:
-    memory:
-      attribute_equlas:
-        unit: KiB
-      value: 8388608
-    currentMemory:
-      attribute_equlas:
-        unit: KiB
-      value: 8388608
diff --git a/labs/ericsson/virtual_kvm/fuel/scripts/.gitkeep b/labs/ericsson/virtual_kvm/fuel/scripts/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/labs/ericsson/virtual_kvm/fuel/scripts/.gitkeep
+++ /dev/null
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
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
diff --git a/labs/lf/pod2/fuel/config/dea-pod-override.yaml b/labs/lf/pod2/fuel/config/dea-pod-override.yaml
deleted file mode 100644
index f4401a3..0000000
--- a/labs/lf/pod2/fuel/config/dea-pod-override.yaml
+++ /dev/null
@@ -1,243 +0,0 @@
-dea-pod-override-config-metadata:
-  title: 'Deployment Environment Adapter POD override for LF, POD2'
-  version: '0.3'
-  created: 'Wed Feb 3 2016'
-  comment: 'Config for LF POD2, Rebased for Fuel10'
-environment:
-  name: opnfv
-interfaces_1:
-  enp6s0:
-  - fuelweb_admin
-  - management
-  - storage
-  - private
-  enp8s0:
-  - public
-interfaces_vlan:
-  enp6s0:
-  - fuelweb_admin
-  - management
-  - storage
-  enp7s0:
-  - private
-  enp8s0:
-  - public
-interfaces_dpdk:
-  enp6s0:
-  - fuelweb_admin
-  - management
-  - storage
-  enp7s0:
-  - private
-  - interface_properties:
-      dpdk:
-        enabled:
-          value: true
-  enp8s0:
-  - 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.0.0
-    ssh_network: 0.0.0.0/0
-  DNS_DOMAIN: domain.tld
-  DNS_SEARCH: domain.tld
-  DNS_UPSTREAM: 8.8.8.8
-  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:
-    - 8.8.4.4
-    - 8.8.8.8
-    floating_name: admin_floating_net
-    floating_ranges:
-    - - 172.30.10.130
-      - 172.30.10.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: 172.30.10.0/24
-    gateway: 172.30.10.1
-    ip_ranges:
-    - - 172.30.10.2
-      - 172.30.10.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: 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: storage
-      notation: cidr
-      render_addr_mask: storage
-      render_type: cidr
-      use_gateway: false
-      vlan_start: 301
-    name: storage
-    vlan_start: 301
-  - 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: management
-      notation: cidr
-      render_addr_mask: internal
-      render_type: cidr
-      use_gateway: false
-      vips:
-      - haproxy
-      - vrouter
-      vlan_start: 300
-    name: management
-    vlan_start: 300
-  - 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: 302
-    name: private
-    vlan_start: 302
-  - 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:
-    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.pool.ntp.org
-        - 1.pool.ntp.org
-        - 2.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/lf/pod2/fuel/config/dha.yaml b/labs/lf/pod2/fuel/config/dha.yaml
deleted file mode 100644
index 99b773d..0000000
--- a/labs/lf/pod2/fuel/config/dha.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-dha-pod-config-metadata:
-  title: Deployment Hardware Adapter (DHA) for LF, POD-2
-# DHA API version supported
-  version: 0.0.2
-  created: Feb 1 2016
-  comment: Config for LF, POD2
-
-# Adapter to use for this definition
-adapter: ipmi
-
-# Node list.
-# Mandatory property is id, all other properties are adapter specific.
-
-nodes:
-- id: 1
-  pxeMac: 00:25:b5:a0:00:2a
-  ipmiIp: 172.30.8.75
-  ipmiUser: admin
-  ipmiPass: octopus
-- id: 2
-  pxeMac: 00:25:b5:a0:00:3a
-  ipmiIp: 172.30.8.65
-  ipmiUser: admin
-  ipmiPass: octopus
-- id: 3
-  pxeMac: 00:25:b5:a0:00:4a
-  ipmiIp: 172.30.8.74
-  ipmiUser: admin
-  ipmiPass: octopus
-- id: 4
-  pxeMac: 00:25:b5:a0:00:5a
-  ipmiIp: 172.30.8.73
-  ipmiUser: admin
-  ipmiPass: octopus
-- id: 5
-  pxeMac: 00:25:b5:a0:00:6a
-  ipmiIp: 172.30.8.72
-  ipmiUser: admin
-  ipmiPass: octopus
-# Adding the Fuel node as node id 6 which may not be correct - please
-# adjust as needed.
-- id: 6
-  libvirtName: fuel-opnfv
-  libvirtTemplate: templates/hardware_environment/vms/fuel.xml
-  isFuel: yes
-  username: root
-  password: r00tme
-
-disks:
-  fuel: 100G
\ No newline at end of file
diff --git a/labs/lf/pod2/fuel/reap/dea.yaml b/labs/lf/pod2/fuel/reap/dea.yaml
deleted file mode 100644
index 9d0c826..0000000
--- a/labs/lf/pod2/fuel/reap/dea.yaml
+++ /dev/null
@@ -1,1100 +0,0 @@
-
-title: Deployment Environment Adapter (DEA)
-# DEA API version supported
-version: 1.1
-created: Tue Jun 21 14:47:41 2016
-comment: None
-environment:
-  name: lf-pod2-manual
-  net_segment_type: tun
-wanted_release: Mitaka on Ubuntu 14.04
-nodes:
-- id: 1
-  interfaces: interfaces_1
-  role: ceph-osd,compute
-  transformations: transformations_1
-- id: 2
-  interfaces: interfaces_1
-  role: ceph-osd,controller
-  transformations: transformations_2
-- id: 3
-  interfaces: interfaces_1
-  role: ceph-osd,controller
-  transformations: transformations_2
-- id: 4
-  interfaces: interfaces_1
-  role: ceph-osd,controller
-  transformations: transformations_2
-- id: 5
-  interfaces: interfaces_1
-  role: ceph-osd,compute
-  transformations: transformations_1
-interfaces_1:
-  enp6s0:
-  - fuelweb_admin
-  - management
-  enp7s0:
-  - private
-  enp8s0:
-  - public
-  enp9s0:
-  - storage
-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-mesh
-  - action: add-port
-    bridge: br-fw-admin
-    name: enp6s0
-  - action: add-port
-    bridge: br-mgmt
-    name: enp6s0.300
-  - action: add-port
-    bridge: br-mesh
-    name: enp7s0
-  - action: add-port
-    bridge: br-storage
-    name: enp9s0
-transformations_2:
-  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: enp6s0
-  - action: add-port
-    bridge: br-mgmt
-    name: enp6s0.300
-  - action: add-port
-    bridge: br-mesh
-    name: enp7s0
-  - action: add-port
-    bridge: br-ex
-    name: enp8s0
-  - action: add-port
-    bridge: br-storage
-    name: enp9s0
-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: 10.20.0.0/24
-  DNS_DOMAIN: domain.tld
-  DNS_SEARCH: domain.tld
-  DNS_UPSTREAM: 8.8.8.8
-  FUEL_ACCESS:
-    password: admin
-    user: admin
-  HOSTNAME: fuel
-  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:
-    - 8.8.4.4
-    - 8.8.8.8
-    floating_name: admin_floating_net
-    floating_ranges:
-    - - 172.30.10.130
-      - 172.30.10.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.2.0/24
-    gateway: null
-    ip_ranges:
-    - - 192.168.2.1
-      - 192.168.2.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: null
-  - cidr: 192.168.1.0/24
-    gateway: null
-    ip_ranges:
-    - - 192.168.1.1
-      - 192.168.1.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: 300
-  - cidr: 192.168.0.0/24
-    gateway: null
-    ip_ranges:
-    - - 192.168.0.1
-      - 192.168.0.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: null
-  - cidr: 172.30.10.0/24
-    gateway: 172.30.10.1
-    ip_ranges:
-    - - 172.30.10.2
-      - 172.30.10.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:
-    access:
-      email:
-        description: Email address for Administrator
-        label: Email
-        regex:
-          error: Invalid email
-          source: ^\S+@\S+$
-        type: text
-        value: admin@localhost
-        weight: 40
-      metadata:
-        group: general
-        label: OpenStack Access
-        weight: 10
-      password:
-        description: Password for Administrator
-        label: Password
-        regex:
-          error: Empty password
-          source: \S
-        type: password
-        value: admin
-        weight: 20
-      tenant:
-        description: Tenant (project) name for Administrator
-        label: Tenant
-        regex:
-          error: Invalid tenant name
-          source: ^(?!services$)(?!nova$)(?!glance$)(?!keystone$)(?!neutron$)(?!cinder$)(?!swift$)(?!ceph$)(?!ironic$)(?![Gg]uest$)(?!.*
-            +.*$).+
-        type: text
-        value: admin
-        weight: 30
-      user:
-        description: Username for Administrator
-        label: Username
-        regex:
-          error: Invalid username
-          source: ^(?!services$)(?!nova$)(?!glance$)(?!keystone$)(?!neutron$)(?!cinder$)(?!swift$)(?!ceph$)(?!ironic$)(?![Gg]uest$)(?!.*
-            +.*$).+
-        type: text
-        value: admin
-        weight: 10
-    additional_components:
-      ceilometer:
-        description: If selected, Ceilometer and Aodh components will be installed
-        label: Install Ceilometer and Aodh
-        type: checkbox
-        value: false
-        weight: 60
-      heat:
-        description: ''
-        label: ''
-        type: hidden
-        value: true
-        weight: 50
-      ironic:
-        description: If selected, Ironic component will be installed
-        label: Install Ironic
-        restrictions:
-        - cluster:net_provider != 'neutron' or networking_parameters:segmentation_type != 'vlan': Ironic
-            requires Neutron with VLAN segmentation.
-        - settings:storage.images_ceph.value == true and settings:storage.objects_ceph.value == false: Ironic
-            requires Swift or RadosGW for Glance images.
-        type: checkbox
-        value: false
-        weight: 80
-      metadata:
-        group: openstack_services
-        label: Additional Components
-        weight: 10
-      mongo:
-        description: If selected, You can use external Mongo DB as ceilometer backend
-        label: Use external Mongo DB
-        restrictions:
-        - settings:additional_components.ceilometer.value == false: External Mongo
-            aims to be an external backend for Ceilometer. Without Ceilometer enabled,
-            External Mongo is useless and should not be installed.
-        type: checkbox
-        value: false
-        weight: 70
-      murano:
-        description: If selected, Murano component will be installed
-        label: Install Murano
-        type: checkbox
-        value: false
-        weight: 20
-      murano-cfapi:
-        description: If selected, Murano service broker will be installed
-        label: Install Murano service broker for Cloud Foundry
-        restrictions:
-        - condition: settings:additional_components.murano.value == false
-          message: Murano should be enabled
-        - action: hide
-          condition: not ('experimental' in version:feature_groups)
-        type: checkbox
-        value: false
-        weight: 30
-      sahara:
-        description: If selected, Sahara component will be installed
-        label: Install Sahara
-        type: checkbox
-        value: false
-        weight: 10
-    cgroups:
-      metadata:
-        always_editable: true
-        group: general
-        label: Cgroups conguration for services
-        restrictions:
-        - action: hide
-          condition: 'true'
-        weight: 90
-    common:
-      auth_key:
-        group: security
-        type: hidden
-        value: ''
-        weight: 70
-      auto_assign_floating_ip:
-        description: If selected, OpenStack will automatically assign a floating IP
-          to a new instance
-        group: network
-        label: Auto assign floating IP
-        restrictions:
-        - action: hide
-          condition: cluster:net_provider == 'neutron'
-        type: checkbox
-        value: false
-        weight: 40
-      debug:
-        description: Debug logging mode provides more information, but requires more
-          disk space.
-        group: logging
-        label: OpenStack debug logging
-        type: checkbox
-        value: false
-        weight: 20
-      libvirt_type:
-        group: compute
-        label: Hypervisor type
-        type: radio
-        value: qemu
-        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
-      metadata:
-        label: Common
-        weight: 10
-      nova_quota:
-        description: Quotas are used to limit CPU and memory usage for tenants. Enabling
-          quotas will increase load on the Nova database.
-        group: compute
-        label: Nova quotas
-        type: checkbox
-        value: false
-        weight: 30
-      propagate_task_deploy:
-        type: hidden
-        value: false
-        weight: 12
-      puppet_debug:
-        description: Debug puppet logging mode provides more information, but requires
-          more disk space.
-        group: logging
-        label: Puppet debug logging
-        type: checkbox
-        value: true
-        weight: 20
-      resume_guests_state_on_host_boot:
-        description: Whether to resume previous guests state when the host reboots.
-          If enabled, this option causes guests assigned to the host to resume their
-          previous state. If the guest was running a restart will be attempted when
-          nova-compute starts. If the guest was not running previously, a restart
-          will not be attempted.
-        group: compute
-        label: Resume guests state on host boot
-        type: checkbox
-        value: true
-        weight: 50
-      task_deploy:
-        type: hidden
-        value: true
-        weight: 11
-      use_cow_images:
-        description: For most cases you will want qcow format. If it's disabled, raw
-          image format will be used to run VMs. OpenStack with raw format currently
-          does not support snapshotting.
-        group: storage
-        label: Use qcow format for images
-        type: checkbox
-        value: true
-        weight: 60
-      use_vcenter:
-        type: hidden
-        value: false
-        weight: 30
-    corosync:
-      group:
-        description: ''
-        label: Group
-        type: text
-        value: 226.94.1.1
-        weight: 10
-      metadata:
-        group: general
-        label: Corosync
-        restrictions:
-        - action: hide
-          condition: 'true'
-        weight: 50
-      port:
-        description: ''
-        label: Port
-        type: text
-        value: '12000'
-        weight: 20
-      verified:
-        description: Set True only if multicast is configured correctly on router.
-        label: Need to pass network verification.
-        type: checkbox
-        value: false
-        weight: 10
-    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_mongo:
-      hosts_ip:
-        description: IP Addresses of MongoDB. Use comma to split IPs
-        label: MongoDB hosts IP
-        regex:
-          error: Invalid hosts ip sequence
-          source: ^(((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?),)*((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$
-        type: text
-        value: ''
-        weight: 30
-      metadata:
-        group: openstack_services
-        label: External MongoDB
-        restrictions:
-        - action: hide
-          condition: settings:additional_components.mongo.value == false
-          message: Ceilometer and MongoDB are not enabled on the Additional Components
-            section
-        weight: 30
-      mongo_db_name:
-        description: Mongo database name
-        label: Database name
-        regex:
-          error: Invalid database name
-          source: ^\w+$
-        type: text
-        value: ceilometer
-        weight: 30
-      mongo_password:
-        description: Mongo database password
-        label: Password
-        regex:
-          error: Password contains spaces
-          source: ^\S*$
-        type: password
-        value: ceilometer
-        weight: 30
-      mongo_replset:
-        description: Name for Mongo replication set
-        label: Replset
-        type: text
-        value: ''
-        weight: 30
-      mongo_user:
-        description: Mongo database username
-        label: Username
-        regex:
-          error: Empty username
-          source: ^\w+$
-        type: text
-        value: ceilometer
-        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.fuel.pool.ntp.org
-        - 1.fuel.pool.ntp.org
-        - 2.fuel.pool.ntp.org
-        weight: 10
-    kernel_params:
-      kernel:
-        description: Default kernel parameters
-        label: Initial parameters
-        type: text
-        value: console=tty0 net.ifnames=0 biosdevname=0 rootdelay=90 nomodeset
-      metadata:
-        group: general
-        label: Kernel parameters
-        weight: 60
-    murano_settings:
-      metadata:
-        group: openstack_services
-        label: Murano Settings
-        restrictions:
-        - action: hide
-          condition: settings:additional_components.murano.value == false
-          message: Murano is not enabled on the Additional Components section
-        weight: 20
-      murano_glance_artifacts_plugin:
-        description: If selected glance artifact repository will be enabled
-        label: Enable glance artifact repository
-        type: checkbox
-        value: true
-        weight: 40
-      murano_repo_url:
-        description: ''
-        label: Murano Repository URL
-        type: text
-        value: http://storage.apps.openstack.org/
-        weight: 10
-    neutron_advanced_configuration:
-      metadata:
-        group: network
-        label: Neutron Advanced Configuration
-        restrictions:
-        - action: hide
-          condition: cluster:net_provider != 'neutron'
-        weight: 20
-      neutron_dvr:
-        description: Enable Distributed Virtual Routers in Neutron
-        label: Neutron DVR
-        restrictions:
-        - ? networking_parameters:segmentation_type != 'vlan' and settings:neutron_advanced_configuration.neutron_l2_pop.value
-            == false
-          : DVR requires L2 population to be enabled.
-        type: checkbox
-        value: false
-        weight: 20
-      neutron_l2_pop:
-        description: Enable L2 population mechanism in Neutron
-        label: Neutron L2 population
-        restrictions:
-        - action: hide
-          condition: networking_parameters:segmentation_type == 'vlan'
-        type: checkbox
-        value: false
-        weight: 10
-      neutron_l3_ha:
-        description: 'Enable High Availability features for Virtual Routers in Neutron
-
-          Requires at least 2 Controller nodes to function properly
-
-          '
-        label: Neutron L3 HA
-        restrictions:
-        - condition: settings:neutron_advanced_configuration.neutron_dvr.value ==
-            true
-          message: Neutron DVR must be disabled in order to use Neutron L3 HA
-        type: checkbox
-        value: false
-        weight: 30
-      neutron_qos:
-        description: Enable Neutron QoS advanced service plug-in
-        label: Neutron QoS
-        type: checkbox
-        value: false
-        weight: 40
-    operator_user:
-      authkeys:
-        description: Public SSH keys to include to operator user's authorized keys,
-          one per line.
-        label: Authorized SSH keys
-        type: textarea
-        value: ''
-        weight: 80
-      homedir:
-        description: Home directory for operator user
-        label: Home directory
-        regex:
-          error: Invalid path
-          source: ^/\S
-        type: text
-        value: /home/fueladmin
-        weight: 70
-      metadata:
-        group: general
-        label: Operating System Access
-        weight: 15
-      name:
-        description: Username for operator user
-        label: Username
-        regex:
-          error: Empty username
-          source: \S
-        type: text
-        value: fueladmin
-        weight: 50
-      password:
-        description: Password for operator user
-        label: Password
-        regex:
-          error: Empty password
-          source: \S
-        type: password
-        value: ncLLtKQjwzagmZ84KQ6UUm6y
-        weight: 60
-      sudo:
-        description: Sudoers configuration directives for operator user, one per line.
-        label: Sudoers configuration
-        type: textarea
-        value: 'ALL=(ALL) NOPASSWD: ALL'
-        weight: 90
-    provision:
-      metadata:
-        group: general
-        label: Provision
-        restrictions:
-        - action: hide
-          condition: 'false'
-        weight: 80
-      method:
-        type: hidden
-        value: image
-      packages:
-        label: Initial packages
-        type: textarea
-        value: 'acl
-
-          anacron
-
-          bash-completion
-
-          bridge-utils
-
-          bsdmainutils
-
-          build-essential
-
-          cloud-init
-
-          curl
-
-          daemonize
-
-          debconf-utils
-
-          gdisk
-
-          grub-pc
-
-          hpsa-dkms
-
-          hwloc
-
-          i40e-dkms
-
-          linux-firmware
-
-          linux-firmware-nonfree
-
-          linux-headers-generic-lts-trusty
-
-          linux-image-generic-lts-trusty
-
-          lvm2
-
-          mcollective
-
-          mdadm
-
-          multipath-tools
-
-          multipath-tools-boot
-
-          nailgun-agent
-
-          nailgun-mcagents
-
-          network-checker
-
-          ntp
-
-          openssh-client
-
-          openssh-server
-
-          puppet
-
-          python-amqp
-
-          ruby-augeas
-
-          ruby-ipaddress
-
-          ruby-json
-
-          ruby-netaddr
-
-          ruby-openstack
-
-          ruby-shadow
-
-          ruby-stomp
-
-          telnet
-
-          ubuntu-minimal
-
-          ubuntu-standard
-
-          uuid-runtime
-
-          vim
-
-          virt-what
-
-          vlan
-
-          '
-        weight: 10
-    public_network_assignment:
-      assign_to_all_nodes:
-        description: When disabled, public network will be assigned to controllers
-          only
-        label: Assign public network to all nodes
-        type: checkbox
-        value: false
-        weight: 10
-      metadata:
-        group: network
-        label: Public network assignment
-        restrictions:
-        - action: hide
-          condition: cluster:net_provider != 'neutron'
-        weight: 10
-    public_ssl:
-      cert_data:
-        description: Certificate and private key data, concatenated into a single
-          file
-        label: Certificate
-        restrictions:
-        - action: hide
-          condition: (settings:public_ssl.cert_source.value != 'user_uploaded') or
-            (settings:public_ssl.horizon.value == false and settings:public_ssl.services.value
-            == false)
-        type: file
-        value: ''
-        weight: 40
-      cert_source:
-        description: From where we'll get certificate and private key
-        label: Select source for certificate
-        restrictions:
-        - action: hide
-          condition: settings:public_ssl.horizon.value == false and settings:public_ssl.services.value
-            == false
-        type: radio
-        value: self_signed
-        values:
-        - data: self_signed
-          description: Generate private key and certificate that will be signed by
-            this key
-          label: Self-signed
-        - data: user_uploaded
-          description: Use pre-generated key and certificate
-          label: I have my own keypair with certificate
-        weight: 30
-      horizon:
-        description: Secure access to Horizon enabling HTTPS instead of HTTP
-        label: HTTPS for Horizon
-        restrictions:
-        - settings:public_ssl.services.value == false: TLS for OpenStack public endpoints
-            should be enabled
-        type: checkbox
-        value: false
-        weight: 20
-      hostname:
-        description: Your DNS entries should point to this name. Self-signed certificates
-          also will use this hostname
-        label: DNS hostname for public TLS endpoints
-        restrictions:
-        - action: hide
-          condition: settings:public_ssl.horizon.value == false and settings:public_ssl.services.value
-            == false
-        type: text
-        value: public.fuel.local
-        weight: 50
-      metadata:
-        group: security
-        label: Public TLS
-        weight: 110
-      services:
-        description: Enable TLS termination on HAProxy for OpenStack services
-        label: TLS for OpenStack public endpoints
-        type: checkbox
-        value: false
-        weight: 10
-    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://archive.ubuntu.com/ubuntu/
-        - name: ubuntu-updates
-          priority: null
-          section: main universe multiverse
-          suite: trusty-updates
-          type: deb
-          uri: http://archive.ubuntu.com/ubuntu/
-        - name: ubuntu-security
-          priority: null
-          section: main universe multiverse
-          suite: trusty-security
-          type: deb
-          uri: http://archive.ubuntu.com/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: mos-updates
-          priority: 1050
-          section: main restricted
-          suite: mos9.0-updates
-          type: deb
-          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
-        - name: mos-security
-          priority: 1050
-          section: main restricted
-          suite: mos9.0-security
-          type: deb
-          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
-        - name: mos-holdback
-          priority: 1100
-          section: main restricted
-          suite: mos9.0-holdback
-          type: deb
-          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
-        - name: Auxiliary
-          priority: 1150
-          section: main restricted
-          suite: auxiliary
-          type: deb
-          uri: http://10.20.0.2:8080/mitaka-9.0/ubuntu/auxiliary
-    service_user:
-      homedir:
-        type: hidden
-        value: /var/lib/fuel
-      metadata:
-        group: general
-        label: Service user account
-        restrictions:
-        - action: hide
-          condition: 'true'
-        weight: 10
-      name:
-        type: hidden
-        value: fuel
-      password:
-        type: hidden
-        value: HD5zCwImHk2CquI1aQ26TfzW
-      root_password:
-        type: hidden
-        value: r00tme
-      sudo:
-        type: hidden
-        value: 'ALL=(ALL) NOPASSWD: ALL'
-    storage:
-      admin_key:
-        type: hidden
-        value: AQBuPmlXAAAAABAA8ZTWBEtMtiFLTyZtnffNCA==
-      bootstrap_osd_key:
-        type: hidden
-        value: AQBuPmlXAAAAABAAQ98dra599+HtpB5vQFBNSg==
-      ephemeral_ceph:
-        description: Configures Nova to store ephemeral volumes in RBD. This works
-          best if Ceph is enabled for volumes and images, too. Enables live migration
-          of all types of Ceph backed VMs (without this option, live migration will
-          only work with VMs launched from Cinder volumes).
-        label: Ceph RBD for ephemeral volumes (Nova)
-        type: checkbox
-        value: false
-        weight: 75
-      fsid:
-        type: hidden
-        value: 461e1594-8716-46b0-99ba-e78f3d10a5ab
-      images_ceph:
-        description: Configures Glance to use the Ceph RBD backend to store images.
-          If enabled, this option will prevent Swift from installing.
-        label: Ceph RBD for images (Glance)
-        restrictions:
-        - settings:storage.images_vcenter.value == true: Only one Glance backend could
-            be selected.
-        type: checkbox
-        value: false
-        weight: 30
-      images_vcenter:
-        description: Configures Glance to use the vCenter/ESXi backend to store images.
-          If enabled, this option will prevent Swift from installing.
-        label: VMware vCenter/ESXi datastore for images (Glance)
-        restrictions:
-        - action: hide
-          condition: settings:common.use_vcenter.value != true
-        - condition: settings:storage.images_ceph.value == true
-          message: Only one Glance backend could be selected.
-        type: checkbox
-        value: false
-        weight: 35
-      metadata:
-        group: storage
-        label: Storage Backends
-        weight: 60
-      mon_key:
-        type: hidden
-        value: AQBuPmlXAAAAABAA+o4oiJSVRTqtzjMDGQGkPg==
-      objects_ceph:
-        description: Configures RadosGW front end for Ceph RBD. This exposes S3 and
-          Swift API Interfaces. If enabled, this option will prevent Swift from installing.
-        label: Ceph RadosGW for objects (Swift API)
-        type: checkbox
-        value: false
-        weight: 80
-      osd_pool_size:
-        description: Configures the default number of object replicas in Ceph. This
-          number must be equal to or lower than the number of deployed 'Ceph OSD'
-          nodes.
-        label: Ceph object replication factor
-        regex:
-          error: Invalid number
-          source: ^[1-9]\d*$
-        type: text
-        value: '3'
-        weight: 85
-      radosgw_key:
-        type: hidden
-        value: AQBuPmlXAAAAABAACc6Gg7omlH7OC3DD0kVE2w==
-      volumes_block_device:
-        description: High performance block device storage. It is recommended to have
-          at least one Cinder Block Device
-        label: Cinder Block device driver
-        restrictions:
-        - settings:storage.volumes_ceph.value == true
-        type: checkbox
-        value: false
-        weight: 15
-      volumes_ceph:
-        description: Configures Cinder to store volumes in Ceph RBD images.
-        label: Ceph RBD for volumes (Cinder)
-        restrictions:
-        - settings:storage.volumes_lvm.value == true or settings:storage.volumes_block_device.value
-          == true
-        type: checkbox
-        value: true
-        weight: 20
-      volumes_lvm:
-        description: It is recommended to have at least one Cinder node.
-        label: Cinder LVM over iSCSI for volumes
-        restrictions:
-        - settings:storage.volumes_ceph.value == true
-        type: checkbox
-        value: false
-        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
-    workloads_collector:
-      enabled:
-        type: hidden
-        value: true
-      metadata:
-        group: general
-        label: Workloads Collector User
-        restrictions:
-        - action: hide
-          condition: 'true'
-        weight: 10
-      password:
-        type: password
-        value: WdvCYiIhkSN8BQN2wpPjs7IW
-      tenant:
-        type: text
-        value: services
-      user:
-        type: text
-        value: fuel_stats_user
diff --git a/labs/lf/pod2/fuel/reap/dha.yaml b/labs/lf/pod2/fuel/reap/dha.yaml
deleted file mode 100644
index 0992580..0000000
--- a/labs/lf/pod2/fuel/reap/dha.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
-
-title: Deployment Hardware Adapter (DHA)
-# DHA API version supported
-version: 1.1
-created: Tue Jun 21 14:47:41 2016
-comment: None
-
-# Adapter to use for this definition
-# adapter: [ipmi|libvirt]
-adapter:
-
-# 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: <whatever>
-#       libvirtTemplate: [libvirt/vms/controller.xml | libvirt/vms/compute.xml]
-#
-# For the Fuel Node you need to provide:
-#       libvirtName: <whatever>
-#       libvirtTemplate: libvirt/vms/fuel.xml
-#       isFuel: yes
-#       username: root
-#       password: r00tme
-
-nodes:
-- id: 1
-  ipmiIp: null
-  ipmiPass: null
-  ipmiUser: null
-  libvirtName: null
-  libvirtTemplate: null
-  pxeMac: 00:25:b5:a0:00:2a
-- id: 2
-  ipmiIp: null
-  ipmiPass: null
-  ipmiUser: null
-  libvirtName: null
-  libvirtTemplate: null
-  pxeMac: 00:25:b5:a0:00:3a
-- id: 3
-  ipmiIp: null
-  ipmiPass: null
-  ipmiUser: null
-  libvirtName: null
-  libvirtTemplate: null
-  pxeMac: 00:25:b5:a0:00:4a
-- id: 4
-  ipmiIp: null
-  ipmiPass: null
-  ipmiUser: null
-  libvirtName: null
-  libvirtTemplate: null
-  pxeMac: 00:25:b5:a0:00:5a
-- id: 5
-  ipmiIp: null
-  ipmiPass: null
-  ipmiUser: null
-  libvirtName: null
-  libvirtTemplate: null
-  pxeMac: 00:25:b5:a0:00:6a
-# Adding the Fuel node as node id 6
-# which may not be correct - please adjust as needed.
-- id: 6
-  isFuel: true
-  libvirtName: null
-  libvirtTemplate: null
-  password: r00tme
-  username: root
-disks:
-  compute: 100G
-  controller: 100G
-  fuel: 100G
diff --git a/labs/lf/virtual_kvm/common/scripts/.gitkeep b/labs/lf/virtual_kvm/common/scripts/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/labs/lf/virtual_kvm/common/scripts/.gitkeep
+++ /dev/null
diff --git a/labs/lf/virtual_kvm/fuel/scripts/.gitkeep b/labs/lf/virtual_kvm/fuel/scripts/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/labs/lf/virtual_kvm/fuel/scripts/.gitkeep
+++ /dev/null
diff --git a/labs/zte/pod1/fuel/config/dea-pod-override.yaml b/labs/zte/pod1/fuel/config/dea-pod-override.yaml
deleted file mode 100644
index 454fdb4..0000000
--- a/labs/zte/pod1/fuel/config/dea-pod-override.yaml
+++ /dev/null
@@ -1,318 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# 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 Development Pipeline - Default version'
-  version: '0.3'
-  created: 'Jan 26 2016'
-  comment: 'Rebased for Fuel8'
-environment:
-  name: opnfv
-fuel:
-  ADMIN_NETWORK:
-    dhcp_pool_end: 10.20.6.200
-    dhcp_pool_start: 10.20.6.10
-    ipaddress: 10.20.6.2
-    netmask: 255.255.255.0
-  DNS_DOMAIN: domain.tld
-  DNS_SEARCH: domain.tld
-  DNS_UPSTREAM: 172.60.0.1
-  HOSTNAME: fuel
-  NTP1: 172.60.0.1
-  NTP2:
-  NTP3:
-interfaces_1:
-  ens4f0:
-  - fuelweb_admin
-  ens12f0:
-  - management
-  ens12f1:
-  - storage
-  ens44f0:
-  - private
-  ens44f1:
-  - public
-interfaces_vlan:
-  ens4f0:
-  - fuelweb_admin
-  ens12f0:
-  - management
-  ens12f1:
-  - storage
-  ens44f0:
-  - private
-  ens44f1:
-  - public
-interfaces_dpdk:
-  ens4f0:
-  - fuelweb_admin
-  ens12f0:
-  - management
-  ens12f1:
-  - storage
-  ens44f0:
-  - private
-  - interface_properties:
-      dpdk:
-        enabled:
-          value: true
-  ens44f1:
-  - public
-network:
-  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.60.0.130
-      - 172.60.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: tun
-    vlan_range:
-    - 1000
-    - 1030
-  networks:
-  - cidr: 192.168.61.0/24
-    gateway: null
-    group_id: 2
-    id: 7
-    ip_ranges:
-    - - 192.168.61.1
-      - 192.168.61.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: 161
-  - cidr: 192.168.63.0/24
-    gateway: null
-    group_id: 2
-    id: 9
-    ip_ranges:
-    - - 192.168.63.1
-      - 192.168.63.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: 1120
-  - cidr: 172.60.0.0/24
-    gateway: 172.60.0.1
-    group_id: 2
-    id: 6
-    ip_ranges:
-    - - 172.60.0.10
-      - 172.60.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: 163
-  - cidr: 192.168.62.0/24
-    gateway: null
-    group_id: 2
-    id: 8
-    ip_ranges:
-    - - 192.168.62.1
-      - 192.168.62.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: 162
-  - cidr: 10.20.6.0/24
-    gateway: 10.20.6.2
-    group_id: null
-    id: 1
-    ip_ranges:
-    - - 10.20.6.10
-      - 10.20.6.200
-    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
-  public_vip: 172.60.0.11
-  public_vrouter_vip: 172.60.0.10
-settings:
-  editable:
-    external_dns:
-      dns_list:
-        description: List of upstream DNS servers, separated by comma
-        label: DNS list
-        regex:
-          error: Invalid IP address list
-          source: ^\*$|^(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3}(?:\s*,\s*(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3})*$
-        type: text
-        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, separated by comma
-        label: NTP server list
-        regex:
-          error: Invalid NTP server list
-          source: ^\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(?:\.\d{1,3}){3})\s*(?:,\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(\.\d{1,3}){3})\s*)*$
-        type: text
-        value: 172.60.0.1
-        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
-    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
-          suite: xenial
-          type: deb
-          uri: http://10.20.6.2:8080/mirrors/ubuntu/
-        - name: ubuntu-main
-          priority: null
-          section: main universe multiverse
-          suite: xenial
-          type: deb
-          uri: http://archive.ubuntu.com/ubuntu/
-        - name: ubuntu-updates
-          priority: null
-          section: main universe multiverse
-          suite: xenial-updates
-          type: deb
-          uri: http://archive.ubuntu.com/ubuntu/
-        - name: ubuntu-security
-          priority: null
-          section: main universe multiverse
-          suite: xenial-security
-          type: deb
-          uri: http://archive.ubuntu.com/ubuntu/
-        - name: mos
-          priority: 1050
-          section: main restricted
-          suite: mos10.0
-          type: deb
-          uri: http://10.20.6.2:8080/newton-10.0/ubuntu/x86_64
-        - name: Auxiliary
-          priority: 1150
-          section: main restricted
-          suite: auxiliary
-          type: deb
-          uri: http://10.20.6.2:8080/newton-10.0/ubuntu/auxiliary
diff --git a/labs/zte/pod1/fuel/config/dha.yaml b/labs/zte/pod1/fuel/config/dha.yaml
deleted file mode 100644
index f81d06b..0000000
--- a/labs/zte/pod1/fuel/config/dha.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-dha-pod-config-metadata:
-  title: Deployment Hardware Adapter (DHA) for fuel development pipeline - default version
-  version: 0.0.3
-  created: Feb 1 2016
-  comment: Default Fuel8 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:CF:DC
-  ipmiIp: 192.168.1.101
-  ipmiUser: zteroot
-  ipmiPass: superuser
-- id: 2
-  pxeMac: 74:4A:A4:00:CE:CE
-  ipmiIp: 192.168.1.102
-  ipmiUser: zteroot
-  ipmiPass: superuser
-- id: 3
-  pxeMac: 74:4A:A4:00:CF:58
-  ipmiIp: 192.168.1.103
-  ipmiUser: zteroot
-  ipmiPass: superuser
-- id: 4
-  pxeMac: 74:4A:A4:00:49:84
-  ipmiIp: 192.168.1.104
-  ipmiUser: zteroot
-  ipmiPass: superuser
-- id: 5
-  pxeMac: 74:4A:A4:00:CE:C2
-  ipmiIp: 192.168.1.105
-  ipmiUser: zteroot
-  ipmiPass: superuser
-
-# Adding the Fuel node as node id 6 which may not be correct - please
-# adjust as needed.
-- id: 7
-  libvirtName: fuel-opnfv-1
-  libvirtTemplate: templates/hardware_environment/vms/fuel.xml
-  isFuel: yes
-  username: root
-  password: r00tme
-
-disks:
-  fuel: 100G
diff --git a/labs/zte/pod2/fuel/config/dea-pod-override.yaml b/labs/zte/pod2/fuel/config/dea-pod-override.yaml
deleted file mode 100644
index 1ca2769..0000000
--- a/labs/zte/pod2/fuel/config/dea-pod-override.yaml
+++ /dev/null
@@ -1,318 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# 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 Development Pipeline - Default version'
-  version: '0.3'
-  created: 'Jan 26 2016'
-  comment: 'Rebased for Fuel8'
-environment:
-  name: opnfv
-fuel:
-  ADMIN_NETWORK:
-    dhcp_pool_end: 10.20.7.200
-    dhcp_pool_start: 10.20.7.10
-    ipaddress: 10.20.7.2
-    netmask: 255.255.255.0
-  DNS_DOMAIN: domain.tld
-  DNS_SEARCH: domain.tld
-  DNS_UPSTREAM: 172.70.0.1
-  HOSTNAME: fuel
-  NTP1: 172.70.0.1
-  NTP2:
-  NTP3:
-interfaces_1:
-  ens4f0:
-  - fuelweb_admin
-  ens12f0:
-  - management
-  ens12f1:
-  - storage
-  ens44f0:
-  - private
-  ens44f1:
-  - public
-interfaces_vlan:
-  ens4f0:
-  - fuelweb_admin
-  ens12f0:
-  - management
-  ens12f1:
-  - storage
-  ens44f0:
-  - private
-  ens44f1:
-  - public
-interfaces_dpdk:
-  ens4f0:
-  - fuelweb_admin
-  ens12f0:
-  - management
-  ens12f1:
-  - storage
-  ens44f0:
-  - private
-  - interface_properties:
-      dpdk:
-        enabled:
-          value: true
-  ens44f1:
-  - public
-network:
-  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.70.0.130
-      - 172.70.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: tun
-    vlan_range:
-    - 1000
-    - 1030
-  networks:
-  - cidr: 192.168.71.0/24
-    gateway: null
-    group_id: 2
-    id: 7
-    ip_ranges:
-    - - 192.168.71.1
-      - 192.168.71.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: 171
-  - cidr: 192.168.73.0/24
-    gateway: null
-    group_id: 2
-    id: 9
-    ip_ranges:
-    - - 192.168.73.1
-      - 192.168.73.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: 1130
-  - cidr: 172.70.0.0/24
-    gateway: 172.70.0.1
-    group_id: 2
-    id: 6
-    ip_ranges:
-    - - 172.70.0.10
-      - 172.70.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: 173
-  - cidr: 192.168.72.0/24
-    gateway: null
-    group_id: 2
-    id: 8
-    ip_ranges:
-    - - 192.168.72.1
-      - 192.168.72.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: 172
-  - cidr: 10.20.7.0/24
-    gateway: 10.20.7.2
-    group_id: null
-    id: 1
-    ip_ranges:
-    - - 10.20.7.10
-      - 10.20.7.200
-    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
-  public_vip: 172.70.0.11
-  public_vrouter_vip: 172.70.0.10
-settings:
-  editable:
-    external_dns:
-      dns_list:
-        description: List of upstream DNS servers, separated by comma
-        label: DNS list
-        regex:
-          error: Invalid IP address list
-          source: ^\*$|^(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3}(?:\s*,\s*(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3})*$
-        type: text
-        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, separated by comma
-        label: NTP server list
-        regex:
-          error: Invalid NTP server list
-          source: ^\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(?:\.\d{1,3}){3})\s*(?:,\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(\.\d{1,3}){3})\s*)*$
-        type: text
-        value: 172.70.0.1
-        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
-    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
-          suite: xenial
-          type: deb
-          uri: http://10.20.7.2:8080/mirrors/ubuntu/
-        - name: ubuntu-main
-          priority: null
-          section: main universe multiverse
-          suite: xenial
-          type: deb
-          uri: http://archive.ubuntu.com/ubuntu/
-        - name: ubuntu-updates
-          priority: null
-          section: main universe multiverse
-          suite: xenial-updates
-          type: deb
-          uri: http://archive.ubuntu.com/ubuntu/
-        - name: ubuntu-security
-          priority: null
-          section: main universe multiverse
-          suite: xenial-security
-          type: deb
-          uri: http://archive.ubuntu.com/ubuntu/
-        - name: mos
-          priority: 1050
-          section: main restricted
-          suite: mos10.0
-          type: deb
-          uri: http://10.20.7.2:8080/newton-10.0/ubuntu/x86_64
-        - name: Auxiliary
-          priority: 1150
-          section: main restricted
-          suite: auxiliary
-          type: deb
-          uri: http://10.20.7.2:8080/newton-10.0/ubuntu/auxiliary
diff --git a/labs/zte/pod2/fuel/config/dha.yaml b/labs/zte/pod2/fuel/config/dha.yaml
deleted file mode 100644
index 98ee6a0..0000000
--- a/labs/zte/pod2/fuel/config/dha.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-dha-pod-config-metadata:
-  title: Deployment Hardware Adapter (DHA) for fuel development pipeline - default version
-  version: 0.0.3
-  created: Feb 1 2016
-  comment: Default Fuel8 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:CD:72
-  ipmiIp: 192.168.1.106
-  ipmiUser: zteroot
-  ipmiPass: superuser
-- id: 2
-  pxeMac: 74:4A:A4:00:CA:CC
-  ipmiIp: 192.168.1.107
-  ipmiUser: zteroot
-  ipmiPass: superuser
-- id: 3
-  pxeMac: 74:4A:A4:00:CD:12
-  ipmiIp: 192.168.1.108
-  ipmiUser: zteroot
-  ipmiPass: superuser
-- id: 4
-  pxeMac: 74:4A:A4:00:CF:40
-  ipmiIp: 192.168.1.109
-  ipmiUser: zteroot
-  ipmiPass: superuser
-- id: 5
-  pxeMac: 74:4A:A4:00:CE:D4
-  ipmiIp: 192.168.1.110
-  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-2
-  libvirtTemplate: templates/hardware_environment/vms/fuel.xml
-  isFuel: yes
-  username: root
-  password: r00tme
-
-disks:
-  fuel: 100G
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