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

29 files changed, 0 insertions, 3360 deletions

diff --git a/deploy/config/dea_base.yaml b/deploy/config/dea_base.yaml
deleted file mode 100644
index 939ca7d70..000000000
--- a/deploy/config/dea_base.yaml
+++ /dev/null
@@ -1,1012 +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-base-config-metadata:
-  title: 'Deployment Environment Adapter Base configuration'
-  # DEA API version supported
-  version: '0.4'
-  created: 'Fri Jun 10 2016'
-  comment: 'Rebased for Fuel 10'
-environment:
-  net_segment_type: tun
-fuel:
-  FEATURE_GROUPS:
-  - experimental
-  FUEL_ACCESS:
-    password: admin
-    user: admin
-wanted_release: Newton on Ubuntu 16.04
-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: true
-        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
-    atop:
-      interval:
-        description: Interval between the snapshots in seconds
-        label: Interval between the snapshots
-        regex:
-          error: Should be a number of seconds
-          source: ^[1-9]\d*$
-        restrictions:
-        - action: hide
-          condition: settings:atop.service_enabled.value == false
-        type: text
-        value: '20'
-        weight: 20
-      metadata:
-        enabled: true
-        group: logging
-        label: Advanced System & Process Monitor (atop)
-        toggleable: false
-        weight: 60
-      rotate:
-        description: Number of days to keep log files
-        label: Rotate days
-        regex:
-          error: Should be a number of days
-          source: ^[1-9]\d*$
-        restrictions:
-        - action: hide
-          condition: settings:atop.service_enabled.value == false
-        type: text
-        value: '7'
-        weight: 30
-      service_enabled:
-        description: 'NOTE: When enabled, the service may generate logs up to a gigabyte
-          in size per day.
-
-          This should be taken into consideration when determining the correct size
-          for the log partition.
-
-          '
-        label: Enable atop service
-        type: checkbox
-        value: true
-        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: 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
-      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
-      run_ping_checker:
-        description: Uncheck this box if the public gateway will not be available
-          or will not respond to ICMP requests to the deployed cluster. If unchecked,
-          the controllers will not take public gateway availability into account as
-          part of the cluster health.  If the cluster will not have internet access,
-          you will need to make sure to provide proper offline mirrors for the deployment
-          to succeed.
-        group: network
-        label: Public Gateway is Available
-        type: checkbox
-        value: false
-        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.20.0.1
-        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.pool.ntp.org
-        - 1.pool.ntp.org
-        - 2.pool.ntp.org
-        weight: 10
-    kernel_params:
-      kernel:
-        description: Default kernel parameters
-        label: Initial parameters
-        type: text
-        value: console=tty0 net.ifnames=1 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: sD2hWNhXxB70SJIBBmaixvvt
-        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
-
-          hwloc
-
-          i40e-dkms
-
-          linux-firmware
-
-          linux-headers-generic-lts-xenial
-
-          linux-image-generic-lts-xenial
-
-          lvm2
-
-          mcollective
-
-          mdadm
-
-          multipath-tools
-
-          multipath-tools-boot
-
-          nailgun-agent
-
-          nailgun-mcagents
-
-          network-checker
-
-          ntp
-
-          ntpdate
-
-          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
-        regex:
-          error: Invalid DNS hostname
-          source: ^[a-zA-Z\d]+[-\.\da-zA-Z]*$
-        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
-          suite: xenial
-          type: deb
-          uri: http://10.20.0.2:8080/mirrors/ubuntu/
-        - name: ubuntu-main
-          priority: null
-          section: main universe multiverse
-          suite: xenial
-          type: deb
-          uri: mirror://mirrors.ubuntu.com/mirrors.txt
-        - name: ubuntu-updates
-          priority: null
-          section: main universe multiverse
-          suite: xenial-updates
-          type: deb
-          uri: mirror://mirrors.ubuntu.com/mirrors.txt
-        - name: ubuntu-security
-          priority: null
-          section: main universe multiverse
-          suite: xenial-security
-          type: deb
-          uri: mirror://mirrors.ubuntu.com/mirrors.txt
-        - name: mos
-          priority: 1050
-          section: main restricted
-          suite: mos10.0
-          type: deb
-          uri: http://10.20.0.2:8080/newton-10.0/ubuntu/x86_64
-        - name: mos-updates
-          priority: 1050
-          section: main restricted
-          suite: mos10.0-updates
-          type: deb
-          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/10.0/
-        - name: mos-security
-          priority: 1050
-          section: main restricted
-          suite: mos10.0-security
-          type: deb
-          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/10.0/
-        - name: mos-holdback
-          priority: 1100
-          section: main restricted
-          suite: mos10.0-holdback
-          type: deb
-          uri: http://mirror.fuel-infra.org/mos-repos/ubuntu/10.0/
-        - name: Auxiliary
-          priority: 1150
-          section: main restricted
-          suite: auxiliary
-          type: deb
-          uri: http://10.20.0.2:8080/newton-10.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: 5rkDBE1Pddi75UQuohA6E2s4
-      root_password:
-        type: hidden
-        value: r00tme
-      sudo:
-        type: hidden
-        value: 'ALL=(ALL) NOPASSWD: ALL'
-    ssh:
-      brute_force_protection:
-        description: When enabled, the access from all networks (except the provided
-          ones) will be granted, but the networks will be checked against the brute
-          force attack.
-        label: Brute force protection
-        restrictions:
-        - action: hide
-          condition: settings:ssh.security_enabled.value == false
-        type: checkbox
-        value: false
-        weight: 30
-      metadata:
-        enabled: true
-        group: security
-        label: SSH security
-        toggleable: false
-        weight: 120
-      security_enabled:
-        description: 'NOTE: When enabled, provide at least one working IP address
-          (the Fuel Master node IP is already added).
-
-          We recommend adding new addresses instead of replacing the provided Fuel
-          Master node IP.
-
-          When disabled (by default), the admin, management, and storage networks
-          are only allowed to connect to the SSH service.
-
-          '
-        label: Restrict SSH service on network
-        type: checkbox
-        value: false
-        weight: 10
-      security_networks:
-        description: IPv4/CIDR address
-        label: Restrict access to
-        regex:
-          error: Invalid IPv4/CIDR 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])(\/([0-9]|[1-2][0-9]|3[0-2]))*$
-        restrictions:
-        - action: hide
-          condition: settings:ssh.security_enabled.value == false
-        type: text_list
-        value:
-        - 10.20.0.2
-        weight: 20
-    storage:
-      admin_key:
-        type: hidden
-        value: AQAVkvxXAAAAABAAZzOFaGpPvF4oFOQlz7ud4g==
-      auth_s3_keystone_ceph:
-        description: This allows to authenticate S3 requests basing on EC2/S3 credentials
-          managed by Keystone. Please note that enabling the integration will increase
-          the latency of S3 requests as well as load on Keystone service. Please consult
-          with Mirantis Technical Bulletin 27 and Mirantis Support on mitigating the
-          risks related with load.
-        label: Enable S3 API Authentication via Keystone in Ceph RadosGW
-        restrictions:
-        - action: hide
-          condition: settings:storage.objects_ceph.value == false
-        type: checkbox
-        value: false
-        weight: 82
-      bootstrap_osd_key:
-        type: hidden
-        value: AQAVkvxXAAAAABAA9pOqDPq0En8Dh1Pi6fZENA==
-      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: 801bd64d-bec4-44cc-9126-16245e53f470
-      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: AQAVkvxXAAAAABAA9ZxWFYdRmV+DSwKr7BKKXg==
-      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: AQAVkvxXAAAAABAA1pC6F8i40b7KVCnh5Fe2GQ==
-      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: uuuegVGpIeAzHsAkf1o8KEzK
-      tenant:
-        type: text
-        value: services
-      user:
-        type: text
-        value: fuel_stats_user
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
-
diff --git a/deploy/config/plugins/fuel-barometer_1.0.0.yaml b/deploy/config/plugins/fuel-barometer_1.0.0.yaml
deleted file mode 100644
index 81e66833d..000000000
--- a/deploy/config/plugins/fuel-barometer_1.0.0.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Intel Corp.
-# navyax.bathula@intel.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
-##############################################################################
-plugin-config-metadata:
-  title: Barometer Plugin
-  version: 1.0.0
-  created: 06.02.2017
-  comment: Deploy Barometer plugin
-
-fuel-plugin-collectd-ceilometer:
-  metadata:
-    class: plugin
-    default: false
-    enabled: true
-    label: fuel-plugin-collectd-ceilometer
-    toggleable: true
-    versions:
-    - metadata:
-        always_editable: false
-        plugin_version: 1.0.0
-      enable_mcelog:
-        type: "checkbox"
-        weight: 20
-        value: true
-        label: "Enable collectd for mcelog"
-      enable_hugepages:
-        type: "checkbox"
-        weight: 20
-        value: true
-        label: "Enable collectd for hugepages"
-      enable_ovs_events:
-        type: "checkbox"
-        weight: 20
-        value: true
-        label: "Enable collectd for Open vSwitch events"
-    weight: 70
diff --git a/deploy/config/plugins/fuel-bgpvpn_0.9.0.yaml b/deploy/config/plugins/fuel-bgpvpn_0.9.0.yaml
deleted file mode 100644
index 1aa1259ca..000000000
--- a/deploy/config/plugins/fuel-bgpvpn_0.9.0.yaml
+++ /dev/null
@@ -1,30 +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
-##############################################################################
-plugin-config-metadata:
-  title: BGPVPN fuel Plugin configuration template
-  version: 0.9.0
-  created: 29.06.2016
-  comment: None
-
-bgpvpn:
-  metadata:
-    class: plugin
-    default: false
-    enabled: true
-    label: BGPVPN plugin
-    toggleable: true
-    versions:
-    - metadata:
-        always_editable: false
-        label: BGPVPN plugin
-        plugin_version: 0.9.0
-        restrictions:
-        - cluster:net_provider != 'neutron': Only neutron is supported by BGPVPN-plugin
-        weight: 90
-    weight: 70
diff --git a/deploy/config/plugins/fuel-bgpvpn_1.0.0.yaml b/deploy/config/plugins/fuel-bgpvpn_1.0.0.yaml
deleted file mode 100644
index 70ae3ea3b..000000000
--- a/deploy/config/plugins/fuel-bgpvpn_1.0.0.yaml
+++ /dev/null
@@ -1,33 +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
-##############################################################################
-plugin-config-metadata:
-  title: BGPVPN fuel Plugin configuration template
-  version: 1.0.0
-  created: 01.02.2017
-  comment: None
-
-bgpvpn:
-  metadata:
-    class: plugin
-    default: false
-    enabled: true
-    label: BGPVPN plugin
-    toggleable: true
-    versions:
-    - metadata:
-        always_editable: false
-        label: BGPVPN plugin
-        plugin_version: 1.0.0
-        restrictions:
-          - "cluster:net_provider != 'neutron'": "Only neutron is supported by BGPVPN-plugin"
-          - condition: "settings:opendaylight == null or settings:opendaylight.metadata.enabled != true"
-            strict: false
-            message: "OpenDaylight plugin must be installed and enabled"
-        weight: 90
-    weight: 70
diff --git a/deploy/config/plugins/fuel-congress_1.0.0.yaml b/deploy/config/plugins/fuel-congress_1.0.0.yaml
deleted file mode 100644
index c7ba8a138..000000000
--- a/deploy/config/plugins/fuel-congress_1.0.0.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 Mirantis Inc and others.
-# fzhadaev@mirantis.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
-##############################################################################
-
-plugin-config-metadata:
-  title: Congress fuel plugin configuration template
-  version: 0.1
-  created: 03.10.2016
-  comment: None
-congress:
-  metadata:
-    #chosen_id: Assigned during installation
-    class: plugin
-    default: false
-    enabled: true
-    label: Fuel Congress plugin
-    toggleable: true
-    versions:
-    - enabled:
-        description: Service enable state for congress-server
-        label: Enable
-        type: checkbox
-        value: true
-        weight: 25
-      metadata:
-        contains_legacy_tasks: false
-        db_password:
-          generator: 'password'
-        group: openstack_services
-        hot_pluggable: false
-        #plugin_id: Assigned during installation
-        plugin_version: 1.0.0
-        port: 1789
-        service: congress-server
-        user: congress
-        user_password:
-          generator: 'password'
-      policies:
-        description: Set of policies to configure for congress (in JSON format)
-        label: Policies
-        type: text
-        value: '{}'
-        weight: 50
-    weight: 70
\ No newline at end of file
diff --git a/deploy/config/plugins/fuel-nfvkvm_0.0.1.yaml b/deploy/config/plugins/fuel-nfvkvm_0.0.1.yaml
deleted file mode 100644
index 170424edb..000000000
--- a/deploy/config/plugins/fuel-nfvkvm_0.0.1.yaml
+++ /dev/null
@@ -1,27 +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
-##############################################################################
-
-plugin-config-metadata:
-  title: NFV QEMU-KVM fuel Plugin configuration template
-  version: 0.1
-  created: Wed Jan 6 2016
-  comment: None
-
-fuel-plugin-qemu:
-  metadata:
-    enabled: true
-    label: fuel-plugin-qemu
-    # plugin_id: Assigned during installation
-    toggleable: true
-    weight: 70
-  use_kvm:
-    label: 'EXPERIMENTAL: KVM enhancements for NFV'
-    type: checkbox
-    value: true
-    weight: 20
diff --git a/deploy/config/plugins/fuel-nfvkvm_0.0.2.yaml b/deploy/config/plugins/fuel-nfvkvm_0.0.2.yaml
deleted file mode 100644
index 842e1e10d..000000000
--- a/deploy/config/plugins/fuel-nfvkvm_0.0.2.yaml
+++ /dev/null
@@ -1,34 +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
-##############################################################################
-
-plugin-config-metadata:
-  title: NFV QEMU-KVM fuel Plugin configuration template
-  version: 0.2
-  created: Tue Feb 9 2016
-  comment: None
-
-fuel-plugin-qemu:
-  metadata:
-    #chosen_id: Assigned during installation
-    class: plugin
-    default: false
-    enabled: true
-    label: fuel-plugin-qemu
-    toggleable: true
-    versions:
-    - metadata:
-        always_editable: false
-        #plugin_id: 1 Assigned during installation
-        plugin_version: 0.5.2
-      use_kvm:
-        label: 'EXPERIMENTAL: KVM enhancements for NFV'
-        type: checkbox
-        value: true
-        weight: 20
-    weight: 70
diff --git a/deploy/config/plugins/fuel-nfvkvm_0.9.0.yaml b/deploy/config/plugins/fuel-nfvkvm_0.9.0.yaml
deleted file mode 100644
index 85f3221f7..000000000
--- a/deploy/config/plugins/fuel-nfvkvm_0.9.0.yaml
+++ /dev/null
@@ -1,34 +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
-##############################################################################
-
-plugin-config-metadata:
-  title: NFV KVM fuel Plugin configuration template
-  version: 0.9.0
-  created: 27.07.2016
-  comment: None
-
-fuel-plugin-kvm:
-  metadata:
-    #chosen_id: Assigned during installation
-    class: plugin
-    default: false
-    enabled: true
-    label: fuel-plugin-kvm
-    toggleable: true
-    versions:
-    - metadata:
-        always_editable: false
-        #plugin_id: 1 Assigned during installation
-        plugin_version: 0.9.0
-      use_kvm:
-        label: 'EXPERIMENTAL: KVM enhancements for NFV'
-        type: checkbox
-        value: true
-        weight: 20
-    weight: 70
diff --git a/deploy/config/plugins/fuel-nfvkvm_1.0.0.yaml b/deploy/config/plugins/fuel-nfvkvm_1.0.0.yaml
deleted file mode 100644
index 7d4dd09ff..000000000
--- a/deploy/config/plugins/fuel-nfvkvm_1.0.0.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 Mirantis, Inc. and others.
-# mpolenchuk@mirantis.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
-##############################################################################
-
-plugin-config-metadata:
-  title: NFV KVM fuel Plugin configuration template
-  version: 1.0.0
-  created: 05.12.2016
-  comment: None
-
-fuel-plugin-kvm:
-  metadata:
-    #chosen_id: Assigned during installation
-    class: plugin
-    default: false
-    enabled: true
-    label: fuel-plugin-kvm
-    toggleable: true
-    versions:
-    - metadata:
-        always_editable: false
-        #plugin_id: 1 Assigned during installation
-        plugin_version: 1.0.0
-      use_kvm:
-        label: 'EXPERIMENTAL: KVM enhancements for NFV'
-        type: checkbox
-        value: true
-        weight: 20
-    weight: 70
diff --git a/deploy/config/plugins/fuel-nfvovs_0.0.1.yaml b/deploy/config/plugins/fuel-nfvovs_0.0.1.yaml
deleted file mode 100644
index fdaba2a21..000000000
--- a/deploy/config/plugins/fuel-nfvovs_0.0.1.yaml
+++ /dev/null
@@ -1,28 +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
-##############################################################################
-
-plugin-config-metadata:
-  title: NFV OVS fuel Plugin configuration template
-  version: 0.1
-  created: Wed Jan 6 2016
-  comment: None
-
-fuel-plugin-ovsnfv:
-  fuel-plugin-ovsnfv_text:
-    description: Description for text field
-    label: Text field
-    type: text
-    value: Set default value
-    weight: 25
-  metadata:
-    enabled: true
-    label: Userspace OVS support
-    # plugin_id: Assigned during installation
-    toggleable: true
-    weight: 70
diff --git a/deploy/config/plugins/fuel-nfvovs_0.0.2.yaml b/deploy/config/plugins/fuel-nfvovs_0.0.2.yaml
deleted file mode 100644
index 902938211..000000000
--- a/deploy/config/plugins/fuel-nfvovs_0.0.2.yaml
+++ /dev/null
@@ -1,35 +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
-##############################################################################
-
-plugin-config-metadata:
-  title: NFV OVS fuel Plugin configuration template
-  version: 0.2
-  created: Mon Feb 15 2016
-  comment: Rebased for new plugin arch
-
-fuel-plugin-ovsnfv:
-  metadata:
-    #chosen_id: Assigned during installation
-    class: plugin
-    default: false
-    enabled: true
-    label: Userspace OVS support
-    toggleable: true
-    versions:
-    - fuel-plugin-ovsnfv_text:
-        description: Specify compute node interface to which OVS-DPDK binds
-        label: NIC for DPDK
-        type: text
-        value: ens1f1
-        weight: 25
-      metadata:
-        always_editable: false
-        #plugin_id: Assigned during installation
-        plugin_version: 0.0.1
-    weight: 70
diff --git a/deploy/config/plugins/fuel-nshovs_0.0.1.yaml b/deploy/config/plugins/fuel-nshovs_0.0.1.yaml
deleted file mode 100644
index ec3ac38a9..000000000
--- a/deploy/config/plugins/fuel-nshovs_0.0.1.yaml
+++ /dev/null
@@ -1,44 +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
-##############################################################################
-
-plugin-config-metadata:
-  title: NSHOVS fuel Plugin configuration template
-  version: 0.1
-  created: Wed Feb 17 2016
-  comment: None
-
-fuel-plugin-ovs:
-  metadata:
-    #chosen_id: Choosen at install time
-    class: plugin
-    default: false
-    enabled: true
-    label: Openvswitch with NSH support
-    toggleable: true
-    versions:
-    - dpdk-bind-nic:
-        label: Network device
-        type: text
-        value: eth2
-        weight: 40
-      metadata:
-        always_editable: false
-        #plugin_id: Choosen at install time
-        plugin_version: 0.5.2
-      use_dpdk:
-        label: Use dpdk
-        type: checkbox
-        value: false
-        weight: 20
-      use_dppd:
-        label: Use dppd
-        type: checkbox
-        value: false
-        weight: 20
-    weight: 70
diff --git a/deploy/config/plugins/fuel-nshovs_0.9.0.yaml b/deploy/config/plugins/fuel-nshovs_0.9.0.yaml
deleted file mode 100644
index b5caae039..000000000
--- a/deploy/config/plugins/fuel-nshovs_0.9.0.yaml
+++ /dev/null
@@ -1,37 +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
-##############################################################################
-
-plugin-config-metadata:
-  title: NSHOVS fuel Plugin configuration template
-  version: 0.2
-  created: Jun 30 2016
-  comment: None
-
-fuel-plugin-ovs:
-  metadata:
-    #chosen_id: Choosen at install time
-    class: plugin
-    default: false
-    enabled: true
-    label: Openvswitch with NSH support
-    toggleable: true
-    versions:
-    - install_dpdk:
-        type: "checkbox"
-        weight: 20
-        value: false
-        label: "Install DPDK"
-      install_nsh:
-        type: "checkbox"
-        weight: 20
-        value: false
-        label: "Install NSH"
-      metadata:
-        plugin_version: 0.9.0
-    weight: 70
diff --git a/deploy/config/plugins/fuel-nshovs_1.0.0.yaml b/deploy/config/plugins/fuel-nshovs_1.0.0.yaml
deleted file mode 100644
index 3c87d8b80..000000000
--- a/deploy/config/plugins/fuel-nshovs_1.0.0.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 Mirantis, Inc. and others.
-# mpolenchuk@mirantis.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
-##############################################################################
-
-plugin-config-metadata:
-  title: NSHOVS fuel Plugin configuration template
-  version: 0.3
-  created: Dec 14 2016
-  comment: None
-
-fuel-plugin-ovs:
-  metadata:
-    #chosen_id: Choosen at install time
-    class: plugin
-    default: false
-    enabled: true
-    label: Openvswitch with NSH support
-    toggleable: true
-    versions:
-    - install_dpdk:
-        type: "checkbox"
-        weight: 20
-        value: false
-        label: "Install DPDK"
-      install_nsh:
-        type: "checkbox"
-        weight: 20
-        value: false
-        label: "Install NSH"
-      metadata:
-        plugin_version: 1.0.0
-    weight: 70
diff --git a/deploy/config/plugins/fuel-odl_0.9.0.yaml b/deploy/config/plugins/fuel-odl_0.9.0.yaml
deleted file mode 100644
index a1ff9b519..000000000
--- a/deploy/config/plugins/fuel-odl_0.9.0.yaml
+++ /dev/null
@@ -1,143 +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
-##############################################################################
-
-plugin-config-metadata:
-  title: OpenDaylight fuel Plugin configuration template
-  version: 0.4
-  created: 30.06.2016
-  comment: Add new field for boron version
-opendaylight:
-  metadata:
-    #chosen_id: Assigned during installation
-    class: plugin
-    default: false
-    enabled: true
-    label: OpenDaylight plugin
-    toggleable: true
-    versions:
-    - bgpvpn_gateway:
-        description: Define the default gateway for BGPVPN
-        label: Default Gateway
-        regex:
-          error: Invalid ip number
-          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]?)$
-        restrictions:
-        - settings:opendaylight.enable_bgpvpn.value == false: Only needed if BGPVPN
-            is enabled.
-        type: text
-        value: 0.0.0.0
-        weight: 50
-      enable_bgpvpn:
-        description: 'This enables the bgpvpn extension of neutron togethere with
-          the corresponding sdnvpn features in odl. This feature will disable the
-          standart ovsdb feature from ODL.
-
-          '
-        label: BGPVPN extensions
-        restrictions:
-        - condition: settings:bgpvpn == null or settings:bgpvpn.metadata.enabled
-            == false
-          message: BGPVPN (fuel-plugin-bgpvpn) plugin must be installed and enabled.
-          strict: false
-        - networking_parameters:segmentation_type == 'vlan': This feature works
-            only with segmentation_type != vlan
-        type: checkbox
-        value: false
-        weight: 40
-      enable_l3_odl:
-        label: Use ODL to manage L3 traffic
-        restrictions:
-        - networking_parameters:segmentation_type == 'vlan': Use tunneling segmentation
-            type.
-        - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign
-            public network to all nodes
-        type: checkbox
-        value: false
-        weight: 10
-      enable_sfc:
-        label: SFC features
-        type: checkbox
-        value: false
-        weight: 20
-      sfc_class:
-        description: 'Classifier determines what traffic needs to be chained based
-          on policy based on yang model. The OpenDayLight actually supports the
-          OVSDB NetVirt and the GBP classifier in case of SFC.
-
-          '
-        label: Classifier used by SFC
-        restrictions:
-        - action: hide
-          condition: settings:opendaylight.enable_sfc.value == false
-        type: select
-        value: ncr
-        values:
-        - data: ncr
-          label: NetVirt
-        - data: gcr
-          label: GBP
-        weight: 21
-      metadata:
-        default_credentials:
-          password: admin
-          user: admin
-        hot_pluggable: false
-        jetty_port: 8181
-        odl_features:
-          default:
-          - config
-          - standard
-          - region
-          - package
-          - kar
-          - ssh
-          - management
-          gcr:
-          - odl-groupbasedpolicy-ovssfc
-          ncr:
-          - odl-ovsdb-sfc
-          - odl-ovsdb-sfc-rest
-          odl-default:
-          - odl-restconf-all
-          - odl-aaa-authn
-          - odl-dlux-all
-          ovs:
-          - odl-ovsdb-openstack
-          sfc:
-          - odl-sfc-model
-          - odl-sfc-provider
-          - odl-sfc-provider-rest
-          - odl-sfc-ovs
-          - odl-sfc-openflow-renderer
-          vpn:
-          - odl-vpnservice-openstack
-        odl_deb: opendaylight
-        experimental_odl_deb: opendaylight-experimental
-        use_experimental_odl:
-          - enable_bgpvpn
-        #plugin_id: Assigned during installation
-        plugin_version: 0.9.0
-        restrictions:
-        - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight
-      odl_v2:
-        description: V2 version is considered as experimental
-        label: Use V2 ML2 driver
-        type: checkbox
-        value: false
-        weight: 60
-      rest_api_port:
-        description: Port on which ODL REST API will be available.
-        label: Port number
-        regex:
-          error: Invalid port number
-          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: '8282'
-        weight: 70
-    weight: 70
diff --git a/deploy/config/plugins/fuel-odl_1.0.0.yaml b/deploy/config/plugins/fuel-odl_1.0.0.yaml
deleted file mode 100644
index c223130f3..000000000
--- a/deploy/config/plugins/fuel-odl_1.0.0.yaml
+++ /dev/null
@@ -1,151 +0,0 @@
-##############################################################################
-# Copyright (c) 2015,2016 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
-##############################################################################
-
-plugin-config-metadata:
-  title: OpenDaylight fuel Plugin configuration template
-  version: 0.5
-  created: 07.12.2016
-  comment: Fuel 10 support
-opendaylight:
-  metadata:
-    #chosen_id: Assigned during installation
-    class: plugin
-    default: false
-    enabled: true
-    label: OpenDaylight plugin
-    toggleable: true
-    versions:
-    - enable_l3_odl:
-        weight: 10
-        type: "checkbox"
-        value: false
-        label: "Use ODL to manage L3 traffic"
-        restrictions:
-          - networking_parameters:segmentation_type == 'vlan': Use tunneling segmentation type.
-          - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign public network to all nodes
-      enable_sfc:
-        weight: 20
-        type: "checkbox"
-        value: false
-        label: "SFC features"
-      sfc_class:
-        weight: 21
-        type: "select"
-        value: "ncr"
-        label: "Classifier used by SFC"
-        values:
-          - data: "ncr"
-            label: "NetVirt"
-          - data: "gcr"
-            label: "GBP"
-        description:
-          >
-           Classifier determines what traffic needs to be chained based on policy based on yang model.
-           The OpenDayLight actually supports the OVSDB NetVirt and the GBP classifier in case of SFC.
-        restrictions:
-          - condition: "settings:opendaylight.enable_sfc.value == false"
-            action: "hide"
-      enable_bgpvpn:
-        weight: 40
-        type: "checkbox"
-        value: false
-        label: "BGPVPN extensions"
-        description:
-          >
-            This enables the bgpvpn extension of neutron together with the
-            corresponding sdnvpn features in odl. This feature will disable
-            the standard ovsdb feature from ODL.
-        restrictions:
-          - condition: "settings:bgpvpn == null or settings:bgpvpn.metadata.enabled == false"
-            strict: false
-            message: "BGPVPN (fuel-plugin-bgpvpn) plugin must be installed and enabled."
-          - networking_parameters:segmentation_type == 'vlan': This feature works only with segmentation_type != vlan
-          - condition: "settings:opendaylight.enable_l3_odl.value == false"
-            strict: false
-            message: "OpenDaylight must be acting as the L3 controller for the bgpvpn features to be enabled."
-          - condition: "settings:opendaylight.deb_version.value != '5.2.0-1'"
-            strict: false
-            message: "The BGPVPN features only support OpenDaylight 5.2.0-1. The OpenDaylight package version field must be set to that value."
-      odl_v2:
-        weight: 60
-        type: "checkbox"
-        value: false
-        label: "Use V2 ML2 driver"
-        description: "V2 version is considered as experimental"
-      rest_api_port:
-        value: '8282'
-        label: 'Port number'
-        description: 'Port on which ODL REST API will be available.'
-        weight: 70
-        type: "text"
-        regex:
-          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])$
-          error: 'Invalid port number'
-      java_min_mem:
-        value: '1g'
-        label: 'Java -Xms option'
-        description: 'Initial memory allocation pool.'
-        weight: 80
-        type: "text"
-      java_max_mem:
-        value: '2g'
-        label: 'Java -Xmx option'
-        description: 'Maximum memory allocation pool.'
-        weight: 81
-        type: "text"
-      java_extra_opts:
-        value: '-XX:+UseG1GC'
-        label: 'Java extra options'
-        description: 'Additional options.'
-        weight: 82
-        type: "text"
-      deb_version:
-        value: '5.0.0-1'
-        label: 'OpenDaylight package version'
-        description: 'Plugin can be build with more than one version of ODL.'
-        weight: 90
-        type: "text"
-      metadata:
-        restrictions:
-          - "cluster:net_provider != 'neutron'": "Only neutron is supported by OpenDaylight"
-        odl_features:
-          default:
-            - config
-            - standard
-            - region
-            - package
-            - kar
-            - ssh
-            - management
-          odl-default:
-            - odl-restconf-all
-            - odl-aaa-authn
-            - odl-dlux-all
-          gcr:
-            - odl-groupbasedpolicy-ovssfc
-          ncr:
-            - odl-ovsdb-sfc
-            - odl-ovsdb-sfc-rest
-          ovsdb:
-            - odl-ovsdb-openstack
-          netvirt:
-            - odl-netvirt-openstack
-          sfc:
-            - odl-sfc-model
-            - odl-sfc-provider
-            - odl-sfc-provider-rest
-            - odl-sfc-ovs
-            - odl-sfc-openflow-renderer
-        default_credentials:
-          user: admin
-          password: admin
-        jetty_port: 8181
-        #plugin_id: Assigned during installation
-        plugin_version: 1.0.0
-    weight: 70
diff --git a/deploy/config/plugins/fuel-onos_0.0.1.yaml b/deploy/config/plugins/fuel-onos_0.0.1.yaml
deleted file mode 100644
index 54ecdc0dc..000000000
--- a/deploy/config/plugins/fuel-onos_0.0.1.yaml
+++ /dev/null
@@ -1,33 +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
-##############################################################################
-
-plugin-config-metadata:
-  title: ONOS fuel Plugin configuration template
-  version: 0.1
-  created: Wed Jan 7 2016
-  comment: None
-
-onos:
-  metadata:
-    enabled: true
-    label: onos plugin
-    # plugin_id: Assigned during installation
-    restrictions:
-    - cluster:net_provider != 'neutron': Neutron only
-    toggleable: true
-    weight: 70
-  public_eth:
-    description: Please note that onos needs an independent eth for public
-      network when interfaces of nodes are configured, or L3 traffic to
-      internet will fail!
-      Defualt is eth3.
-    label: Public Ethernet Port
-    type: text
-    value: eth3
-    weight: 20
diff --git a/deploy/config/plugins/fuel-onos_0.0.2.yaml b/deploy/config/plugins/fuel-onos_0.0.2.yaml
deleted file mode 100644
index 1d0b54d04..000000000
--- a/deploy/config/plugins/fuel-onos_0.0.2.yaml
+++ /dev/null
@@ -1,33 +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
-##############################################################################
-
-plugin-config-metadata:
-  title: ONOS fuel Plugin configuration template
-  version: 0.2
-  created: Fre Jan 29 2016
-  comment: None
-
-onos:
-  metadata:
-    # chosen_id: Assigned during installation
-    class: plugin
-    default: false
-    enabled: true
-    label: onos plugin
-    toggleable: true
-    versions:
-    - metadata:
-        always_editable: false
-        # plugin_id: Assigned during installation
-        plugin_version: 0.8.0
-        restrictions:
-        - cluster:net_provider != 'neutron': Neutron only
-        - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign
-            public network to all nodes
-    weight: 70
diff --git a/deploy/config/plugins/fuel-onos_0.0.3.yaml b/deploy/config/plugins/fuel-onos_0.0.3.yaml
deleted file mode 100644
index 8ff9c8323..000000000
--- a/deploy/config/plugins/fuel-onos_0.0.3.yaml
+++ /dev/null
@@ -1,38 +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
-##############################################################################
-
-plugin-config-metadata:
-  title: ONOS fuel Plugin configuration template
-  version: 0.3
-  created: Wed Jun 8 2016
-  comment: add sfc feature
-
-onos:
-  metadata:
-    # chosen_id: Assigned during installation
-    class: plugin
-    default: false
-    enabled: true
-    label: onos plugin
-    toggleable: true
-    versions:
-    - enable_sfc:
-        label: SFC features
-        type: checkbox
-        value: true
-        weight: 13
-      metadata:
-        hot_pluggable: false
-        # plugin_id: Assigned during installation
-        plugin_version: 0.10.2
-        restrictions:
-        - cluster:net_provider != 'neutron': Neutron only
-        - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign
-              public network to all nodes
-    weight: 70
diff --git a/deploy/config/plugins/fuel-tacker_0.9.0.yaml b/deploy/config/plugins/fuel-tacker_0.9.0.yaml
deleted file mode 100644
index 71e028ffd..000000000
--- a/deploy/config/plugins/fuel-tacker_0.9.0.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-##############################################################################
-# Copyright (c) 2015,2016 Ericsson AB and others.
-# mskalski@mirantis.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
-##############################################################################
-
-plugin-config-metadata:
-  title: Tacker fuel plugin configuration template
-  version: 0.1
-  created: 03.10.2016
-  comment: None
-tacker:
-  metadata:
-    #chosen_id: Assigned during installation
-    class: plugin
-    default: false
-    enabled: true
-    label: Tacker VNF manager
-    toggleable: true
-    versions:
-    - metadata:
-        group: 'openstack_services'
-        db_password:
-          generator: 'password'
-        user_password:
-          generator: 'password'
-        user: 'tacker'
-        port: 8889
-        service: 'tacker-server'
-        restrictions:
-          - condition: "settings:opendaylight == null or settings:opendaylight.metadata.enabled == false or settings:opendaylight.enable_sfc.value == false"
-            strict: false
-            message: "Please install OpenDaylight Plugin with SFC features enabled"
-          - condition: "settings:fuel-plugin-ovs == null or settings:fuel-plugin-ovs.metadata.enabled == false"
-            strict: false
-            message: "Please install and enable Openvswitch plugin with NSH support."
-            #plugin_id: Assigned during installation
-            plugin_version: 0.2.0
-      debug:
-        value: false
-        label: 'Debug logging'
-        description: 'Debug logging mode provides more information, but requires more disk space.'
-        weight: 25
-        type: "checkbox"
-  weight: 70
diff --git a/deploy/config/plugins/fuel-tacker_1.0.0.yaml b/deploy/config/plugins/fuel-tacker_1.0.0.yaml
deleted file mode 100644
index 538975439..000000000
--- a/deploy/config/plugins/fuel-tacker_1.0.0.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-##############################################################################
-# Copyright (c) 2015,2016 Ericsson AB and others.
-# mskalski@mirantis.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
-##############################################################################
-
-plugin-config-metadata:
-  title: Tacker fuel plugin configuration template
-  version: 0.2
-  created: 02.02.2017
-  comment: Fuel 10 support
-tacker:
-  metadata:
-    #chosen_id: Assigned during installation
-    class: plugin
-    default: false
-    enabled: true
-    label: Tacker VNF manager
-    toggleable: true
-    versions:
-    - metadata:
-        group: 'openstack_services'
-        db_password:
-          generator: 'password'
-        user_password:
-          generator: 'password'
-        user: 'tacker'
-        port: 8889
-        service: 'tacker-server'
-        restrictions:
-          - condition: "settings:opendaylight == null or settings:opendaylight.metadata.enabled == false or settings:opendaylight.enable_sfc.value == false"
-            strict: false
-            message: "Please install OpenDaylight Plugin with SFC features enabled"
-          - condition: "settings:fuel-plugin-ovs == null or settings:fuel-plugin-ovs.metadata.enabled == false"
-            strict: false
-            message: "Please install and enable Openvswitch plugin with NSH support."
-            #plugin_id: Assigned during installation
-            plugin_version: 1.0.0
-      debug:
-        value: false
-        label: 'Debug logging'
-        description: 'Debug logging mode provides more information, but requires more disk space.'
-        weight: 25
-        type: "checkbox"
-  weight: 70