Merge "build, deploy: Remove obsolete Fuel@Openstack code"

8 files changed, 0 insertions, 1391 deletions

diff --git a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml
deleted file mode 100644
index 852b363d4..000000000
--- a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml
+++ /dev/null
@@ -1,256 +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 Development Pipeline - Ericsson ELX version'
-  version: '0.3'
-  created: 'Fri Jun 10 2016'
-  comment: 'Rebased for Fuel 9'
-environment:
-  name: opnfv_virt
-interfaces_1:
-  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
-interfaces_vlan:
-  ens3:
-  - fuelweb_admin
-  - storage
-  ens4:
-  - management
-  ens5:
-  - private
-  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: 10.20.0.0/24
-  DNS_DOMAIN: domain.tld
-  DNS_SEARCH: domain.tld
-  DNS_UPSTREAM: 8.8.8.8, 8.8.4.4
-  HOSTNAME: fuel
-  NTP1: 0.ubuntu.pool.ntp.org
-  NTP2: 1.ubuntu.pool.ntp.org
-  NTP3: 2.ubuntu.pool.ntp.org
-network:
-  networking_parameters:
-    base_mac: fa:16:3e:00:00:00
-    configuration_template: null
-    dns_nameservers:
-    - 8.8.8.8
-    - 8.8.4.4
-    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
-        - 8.8.4.4
-        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.ubuntu.pool.ntp.org
-        - 1.ubuntu.pool.ntp.org
-        - 2.ubuntu.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/deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml b/deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml
deleted file mode 100644
index 0374c5d29..000000000
--- a/deploy/config/labs/devel-pipeline/default/fuel/config/dha.yaml
+++ /dev/null
@@ -1,109 +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
-##############################################################################
-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: 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:
-  fuel:
-    vcpu:
-      value: 2
-    memory:
-      attribute_equlas:
-        unit: KiB
-      value: 8388608
-    currentMemory:
-      attribute_equlas:
-        unit: KiB
-      value: 8388608
-    devices:
-      interface:
-        # With attribute_equlas someone can define which
-        # interface type is meant
-        attribute_equlas:
-          type: network
-        # This will overwrite the type of the model of
-        # the interface
-        model:
-          attribute:
-            type: virtio
-  controller:
-    vcpu:
-      value: 4
-    memory:
-      attribute_equlas:
-        unit: KiB
-      value: 10485760
-    currentMemory:
-      attribute_equlas:
-        unit: KiB
-      value: 10485760
-    devices:
-      interface:
-        attribute_equlas:
-          type: network
-        model:
-          attribute:
-            type: e1000
-  compute:
-    memory:
-      attribute_equlas:
-        unit: KiB
-      value: 6291456
-    currentMemory:
-      attribute_equlas:
-        unit: KiB
-      value: 6291456
-    devices:
-      interface:
-        attribute_equlas:
-          type: network
-        model:
-          attribute:
-            type: e1000
diff --git a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
deleted file mode 100644
index 150d4ed06..000000000
--- a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
+++ /dev/null
@@ -1,253 +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 Development Pipeline - Ericsson ELX version'
-  version: '0.3'
-  created: 'Fri Jun 10 2016'
-  comment: 'Rebased for Fuel 9'
-environment:
-  name: opnfv_virt
-interfaces_1:
-  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
-interfaces_vlan:
-  ens3:
-  - fuelweb_admin
-  - storage
-  ens4:
-  - management
-  ens5:
-  - private
-  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: 10.20.0.0/24
-  DNS_DOMAIN: domain.tld
-  DNS_SEARCH: domain.tld
-  DNS_UPSTREAM: 147.214.6.234
-  HOSTNAME: fuel
-  NTP1: time1.ericsson.se
-  NTP2: time2.ericsson.se
-  NTP3: time2.ericsson.se
-network:
-  networking_parameters:
-    base_mac: fa:16:3e:00:00:00
-    configuration_template: null
-    dns_nameservers:
-    - 147.214.6.234
-    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:
-        - 147.214.6.234
-        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:
-        - time1.ericsson.se
-        - time2.ericsson.se
-        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/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml b/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml
deleted file mode 100644
index c2352f924..000000000
--- a/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml
+++ /dev/null
@@ -1,110 +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
-##############################################################################
-dha-pod-config-metadata:
-  title: Deployment Hardware Adapter (DHA) for fuel development pipeline - Ericsson ELX version
-  version: 0.0.3
-  created: Feb 2 2016
-  comment: ELX Fuel 9 version
-
-# 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:
-  fuel:
-    vcpu:
-      value: 2
-    memory:
-      attribute_equlas:
-        unit: KiB
-      value: 8388608
-    currentMemory:
-      attribute_equlas:
-        unit: KiB
-      value: 8388608
-    devices:
-      interface:
-        # With attribute_equlas someone can define which
-        # interface type is meant
-        attribute_equlas:
-          type: network
-        # This will overwrite the type of the model of
-        # the interface
-        model:
-          attribute:
-            type: virtio
-  controller:
-    vcpu:
-      value: 4
-    memory:
-      attribute_equlas:
-        unit: KiB
-      value: 10485760
-    currentMemory:
-      attribute_equlas:
-        unit: KiB
-      value: 10485760
-    devices:
-      interface:
-        attribute_equlas:
-          type: network
-        model:
-          attribute:
-            type: e1000
-  compute:
-    memory:
-      attribute_equlas:
-        unit: KiB
-      value: 6291456
-    currentMemory:
-      attribute_equlas:
-        unit: KiB
-      value: 6291456
-    devices:
-      interface:
-        attribute_equlas:
-          type: network
-        model:
-          attribute:
-            type: e1000
-
diff --git a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml
deleted file mode 100644
index be80b9724..000000000
--- a/deploy/config/labs/devel-pipeline/huawei-ch/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 Development Pipeline - Huawei-China version'
-  version: '0.3'
-  created: '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_dpdk:
-  ens3:
-  - fuelweb_admin
-  - storage
-  ens4:
-  - management
-  ens5:
-  - private
-  - interface_properties:
-      dpdk:
-        enabled:
-          value: true
-  ens6:
-  - public
-interfaces_vlan:
-  ens3:
-  - fuelweb_admin
-  - storage
-  ens4:
-  - management
-  ens5:
-  - private
-  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: 10.20.0.0/24
-  DNS_DOMAIN: domain.tld
-  DNS_SEARCH: domain.tld
-  DNS_UPSTREAM: 114.114.114.114
-  HOSTNAME: fuel
-  NTP1: 0.fuel.pool.ntp.org
-  NTP2: 1.fuel.pool.ntp.org
-  NTP3: 2.fuel.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:
-    - - 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:
-        - 114.114.114.114
-        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.fuel.pool.ntp.org
-        - 1.fuel.pool.ntp.org
-        - 2.fuel.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/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dha.yaml b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dha.yaml
deleted file mode 100644
index d8f904362..000000000
--- a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dha.yaml
+++ /dev/null
@@ -1,47 +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
-##############################################################################
-dha-pod-config-metadata:
-  title: Deployment Hardware Adapter (DHA) for fuel development pipeline - default version
-  version: 0.0.4
-  created: Jun 14 2016
-  comment: Huawei-Ch Fuel9 version
-
-# 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
diff --git a/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml
deleted file mode 100644
index 35a2201cf..000000000
--- a/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml
+++ /dev/null
@@ -1,252 +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 Development Pipeline - Intel Santa Clara, CA, USA version'
-  version: '0.1'
-  created: 'Wed Sept 7 2016'
-  comment: 'For Fuel 9'
-environment:
-  name: opnfv_virt
-interfaces_1:
-  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
-interfaces_vlan:
-  ens3:
-  - fuelweb_admin
-  - storage
-  ens4:
-  - management
-  ens5:
-  - private
-  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: 10.20.0.0/24
-  DNS_DOMAIN: domain.tld
-  DNS_SEARCH: domain.tld
-  DNS_UPSTREAM: 10.248.2.1
-  HOSTNAME: fuel
-  NTP1: 10.20.0.1
-  NTP2: null
-  NTP3: null
-network:
-  networking_parameters:
-    base_mac: fa:16:3e:00:00:00
-    configuration_template: null
-    dns_nameservers:
-    - 10.248.2.1
-    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:
-        - 147.214.6.234
-        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:
-        - 10.20.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
-
diff --git a/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dha.yaml b/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dha.yaml
deleted file mode 100644
index 837293950..000000000
--- a/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dha.yaml
+++ /dev/null
@@ -1,110 +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
-##############################################################################
-dha-pod-config-metadata:
-  title: Deployment Hardware Adapter (DHA) for fuel development pipeline - Intel Santa Clara, CA. USA version
-  version: 0.0.1
-  created: Sept 7 2016
-  comment: Intel Santa Clara, CA, USA Fuel 9 version
-
-# 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:
-  fuel:
-    vcpu:
-      value: 2
-    memory:
-      attribute_equlas:
-        unit: KiB
-      value: 8388608
-    currentMemory:
-      attribute_equlas:
-        unit: KiB
-      value: 8388608
-    devices:
-      interface:
-        # With attribute_equlas someone can define which
-        # interface type is meant
-        attribute_equlas:
-          type: network
-        # This will overwrite the type of the model of
-        # the interface
-        model:
-          attribute:
-            type: virtio
-  controller:
-    vcpu:
-      value: 4
-    memory:
-      attribute_equlas:
-        unit: KiB
-      value: 10485760
-    currentMemory:
-      attribute_equlas:
-        unit: KiB
-      value: 10485760
-    devices:
-      interface:
-        attribute_equlas:
-          type: network
-        model:
-          attribute:
-            type: e1000
-  compute:
-    memory:
-      attribute_equlas:
-        unit: KiB
-      value: 6291456
-    currentMemory:
-      attribute_equlas:
-        unit: KiB
-      value: 6291456
-    devices:
-      interface:
-        attribute_equlas:
-          type: network
-        model:
-          attribute:
-            type: e1000
-