build, deploy: Remove obsolete Fuel@Openstack code

JIRA: FUEL-278

Change-Id: I30c04c325de5ac97aee172386de43201988646c5
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

27 files changed, 0 insertions, 3057 deletions

diff --git a/deploy/scenario/README b/deploy/scenario/README
deleted file mode 100644
index e32262d0d..000000000
--- a/deploy/scenario/README
+++ /dev/null
@@ -1,159 +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
-##############################################################################
-
-Abstract:
----------
-The directory contains configuration files for different OPNFV deployment
-feature scenarios used by Fuel@OPNFV, eg.:
-- High availability configuration
-- Type of SDN controller to be deployed
-- OPNFV collaboration project features to be deployed.
-- Provisioning of any other sevices
-
-Creating a new plugin
----------------------
-Creating a new plugin involves creating a plugin config yaml file in
-/deploy/config/plugins. The filename should comply to following structure:
-fuel-<plugin_name>.yaml.
-The plugin configuration must include plugin configuration metadata as below:
-
-plugin-config-metadata:
-  title:
-  version:
-  created:
-  comment:
-
-Moreover, naturaly the plugin configuration must include the plugin yaml
-fragment, eg:
-
-opendaylight:
-  metadata:
-    enabled: true
-    label: OpenDaylight Lithium plugin
-.......
-
-Creating a new deployment scenario
-----------------------------------
-Creating a new deployment scenario involve creating a deployment scenario
-yaml file under deploy/scenario/. The filename should comply to following
-format: <ha | no-ha>_<SDN Controller>_<feature-1>_..._<feature-n>.yaml
-
-The deployment configuration file must contain configuration metadata as stated
-below:
-
-deployment-scenario-metadata:
-   title:
-   version:
-   created:
-   comment:
-
-To include fuel plugins, use the stack-extentions key:
-stack-extensions, eg:
-
-stack-extensions:
-   - module: opendaylight
-     module-config-name: fuel-odl
-     module-config-version: 0.0.1
-     module-config-override:
-       # Module config overrides
-       rest_api_port:
-         value: '8282'
-       enable_gbp:
-         value: false
-       enable_l3_odl:
-         value: true
-       enable_sfc:
-         value: false
-
-"module-config-name" and "module-config-version" must correspond to how
-the plugin configuration yaml was named.
-Everything under the "module-config-override" overrides the corresponding
-keys in the plugin config yaml file, this can for instance be used to configure
-the plugin.
-
-Everything under the "dea-override-config" overrides corresponding keys in the dea_base.yaml and dea_pod_override.yaml.
-You must at least provide {environment:{mode:'value},{net_segment_type:'value'}
-and {nodes:....} in order to configure the HA mode, network segmentation types
-and role to node assignments.
-Other ovverides may also be used to enable stack features such as ceph, heat,
-etc.
-Example:
-
-dea-override-config:
-  environment:
-    mode: ha
-    net_segment_type: tun
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller,opendaylight
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-  - id: 3
-    interfaces: interfaces_1
-    role: mongo,controller
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-
-  settings:
-    editable:
-      additional_components:
-        ceilometer:
-          description: If selected, Ceilometer component will be installed
-          label: Install Ceilometer
-          type: checkbox
-          value: true
-          weight: 40
-        heat:
-          description: ''
-          label: ''
-          type: hidden
-          value: true
-          weight: 30
-        metadata:
-          label: Additional Components
-          weight: 20
-      storage:
-        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: true
-          weight: 75
-        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: true
-          weight: 30
-
-Optionally you may override the pod dha defenition under the
-"dha-override-config" key.
-
-Short names
------------
-scenario.yaml provides a mapping between a deployment scenario short-name
-and one or several deployment scenario configuration yaml files.
-
-Other
------
-These configuration files are used by deploy.sh provided by Fuel@OPNFV, e.g.
-deploy.sh will clone this repo when deploying.
diff --git a/deploy/scenario/ha_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_heat_ceilometer_scenario.yaml
deleted file mode 100644
index 6b032bfdd..000000000
--- a/deploy/scenario/ha_heat_ceilometer_scenario.yaml
+++ /dev/null
@@ -1,89 +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
-##############################################################################
-
-############################################################################### # Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: OpenStack-only, HA deployment
-   version: 0.0.3
-   created: Jan 26 2016
-   comment: Rebased to Fuel8
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-stack-extensions:
-  - module: congress
-    module-config-name: fuel-congress
-    module-config-version: 1.0.0
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: controller, congress
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo, controller
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,controller
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-
-dha-override-config:
-  nodes:
-  - id: 1
-    libvirtName: controller1
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 2
-    libvirtName: controller2
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 3
-    libvirtName: controller3
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 4
-    libvirtName: compute1
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 5
-    libvirtName: compute2
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 6
-    libvirtName: fuel-master
-    libvirtTemplate: templates/virtual_environment/vms/fuel.xml
-    isFuel: yes
-    username: root
-    password: r00tme
-
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
deleted file mode 100644
index 8ced66dfc..000000000
--- a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
+++ /dev/null
@@ -1,173 +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
-##############################################################################
-
-############################################################################### # Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: NFV KVM HA deployment
-   version: 0.0.6
-   created: 27.07.2016
-   comment: Ceph cannot be assigned to compute, ceph is collocated with one of the controllers
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-stack-extensions:
-   - module: fuel-plugin-kvm
-     module-config-name: fuel-nfvkvm
-     module-config-version: 1.0.0
-     module-config-override:
-       # Module config overrides
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: controller,mongo
-  - id: 2
-    interfaces: interfaces_1
-    role: controller
-  - id: 3
-    interfaces: interfaces_1
-    role: controller
-  - id: 4
-    interfaces: interfaces_1
-    role: compute,ceph-osd
-  - id: 5
-    interfaces: interfaces_1
-    role: compute,ceph-osd
-
-  settings:
-    editable:
-      storage:
-        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
-        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
-        iser:
-          description: 'High performance block storage: Cinder volumes over iSER protocol (iSCSI over RDMA). This feature requires SR-IOV capabilities in the NIC, and will use a dedicated virtual function for the storage network.'
-          label: iSER protocol for volumes (Cinder)
-          restrictions:
-          - settings:storage.volumes_lvm.value != true or settings:common.libvirt_type.value != 'kvm'
-          - action: hide
-            condition: not ('experimental' in version:feature_groups)
-          type: checkbox
-          value: false
-          weight: 11
-        metadata:
-          group: storage
-          label: Storage Backends
-          weight: 60
-        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 'Storage - Ceph OSD' nodes.
-          label: Ceph object replication factor
-          regex:
-            error: Invalid number
-            source: ^[1-9]\d*$
-          type: text
-          value: '2'
-          weight: 85
-        volumes_block_device:
-          description: High performance block device storage. It is recommended to have at least one Storage - 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 Storage - Cinder LVM node.
-          label: Cinder LVM over iSCSI for volumes
-          restrictions:
-          - settings:storage.volumes_ceph.value == true
-          type: checkbox
-          value: false
-          weight: 10
-
-dha-override-config:
-  nodes:
-  - id: 1
-    libvirtName: controller1
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 2
-    libvirtName: controller2
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 3
-    libvirtName: controller3
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 4
-    libvirtName: compute1
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 5
-    libvirtName: compute2
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 6
-    libvirtName: fuel-master
-    libvirtTemplate: templates/virtual_environment/vms/fuel.xml
-    isFuel: yes
-    username: root
-    password: r00tme
-
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml
deleted file mode 100644
index 645f48d21..000000000
--- a/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml
+++ /dev/null
@@ -1,155 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Intel Corp. and others.
-# navyax.bathula@intel.com,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
-##############################################################################
-
-###############################################################################
-# Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: NFV KVM OVS-DPDK and Barometer HA deployment
-   version: 0.0.1
-   created: Feb 6 2017
-   comment: NFV KVM OVS-DPDK and Barometer
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-stack-extensions:
-   - module: fuel-plugin-kvm
-     module-config-name: fuel-nfvkvm
-     module-config-version: 1.0.0
-     module-config-override:
-       # Module config overrides
-   - module: fuel-plugin-collectd-ceilometer
-     module-config-name: fuel-barometer
-     module-config-version: 1.0.0
-     module-config-override:
-       # Module config overrides
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  fuel:
-    FEATURE_GROUPS:
-    - experimental
-  environment:
-    net_segment_type: vlan
-  nodes:
-  - id: 1
-    interfaces: interfaces_vlan
-    role: controller
-  - id: 2
-    interfaces: interfaces_vlan
-    role: mongo,controller
-  - id: 3
-    interfaces: interfaces_vlan
-    role: ceph-osd,controller
-  - id: 4
-    interfaces: interfaces_dpdk
-    role: ceph-osd,compute
-    attributes: attributes_1
-  - id: 5
-    interfaces: interfaces_dpdk
-    role: ceph-osd,compute
-    attributes: attributes_1
-
-  attributes_1:
-    hugepages:
-      dpdk:
-        value: 1024
-      nova:
-        value:
-          '2048': 1024
-
-  network:
-    networking_parameters:
-      segmentation_type: vlan
-    networks:
-    - cidr: null
-      gateway: null
-      ip_ranges: []
-      meta:
-        configurable: false
-        map_priority: 2
-        name: private
-        neutron_vlan_range: true
-        notation: null
-        render_addr_mask: null
-        render_type: null
-        seg_type: vlan
-        use_gateway: false
-        vlan_start: null
-      name: private
-      vlan_start: null
-
-  settings:
-    editable:
-      storage:
-        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: true
-          weight: 75
-        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: true
-          weight: 30
-
-dha-override-config:
-  nodes:
-  - id: 1
-    libvirtName: controller1
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 2
-    libvirtName: controller2
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 3
-    libvirtName: controller3
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 4
-    libvirtName: compute1
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 5
-    libvirtName: compute2
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 6
-    libvirtName: fuel-master
-    libvirtTemplate: templates/virtual_environment/vms/fuel.xml
-    isFuel: yes
-    username: root
-    password: r00tme
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
deleted file mode 100644
index 784883513..000000000
--- a/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
+++ /dev/null
@@ -1,150 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 Intel Corp. and others.
-# navyax.bathula@intel.com,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
-##############################################################################
-
-###############################################################################
-# Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: NFV KVM and OVS-DPDK HA deployment
-   version: 0.0.1
-   created: Dec 20 2016
-   comment: NFV KVM and OVS-DPDK
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-stack-extensions:
-   - module: fuel-plugin-kvm
-     module-config-name: fuel-nfvkvm
-     module-config-version: 1.0.0
-     module-config-override:
-       # Module config overrides
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  fuel:
-    FEATURE_GROUPS:
-    - experimental
-  environment:
-    net_segment_type: vlan
-  nodes:
-  - id: 1
-    interfaces: interfaces_vlan
-    role: controller
-  - id: 2
-    interfaces: interfaces_vlan
-    role: mongo,controller
-  - id: 3
-    interfaces: interfaces_vlan
-    role: ceph-osd,controller
-  - id: 4
-    interfaces: interfaces_dpdk
-    role: ceph-osd,compute
-    attributes: attributes_1
-  - id: 5
-    interfaces: interfaces_dpdk
-    role: ceph-osd,compute
-    attributes: attributes_1
-
-  attributes_1:
-    hugepages:
-      dpdk:
-        value: 1024
-      nova:
-        value:
-          '2048': 1024
-
-  network:
-    networking_parameters:
-      segmentation_type: vlan
-    networks:
-    - cidr: null
-      gateway: null
-      ip_ranges: []
-      meta:
-        configurable: false
-        map_priority: 2
-        name: private
-        neutron_vlan_range: true
-        notation: null
-        render_addr_mask: null
-        render_type: null
-        seg_type: vlan
-        use_gateway: false
-        vlan_start: null
-      name: private
-      vlan_start: null
-
-  settings:
-    editable:
-      storage:
-        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: true
-          weight: 75
-        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: true
-          weight: 30
-
-dha-override-config:
-  nodes:
-  - id: 1
-    libvirtName: controller1
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 2
-    libvirtName: controller2
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 3
-    libvirtName: controller3
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 4
-    libvirtName: compute1
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 5
-    libvirtName: compute2
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 6
-    libvirtName: fuel-master
-    libvirtTemplate: templates/virtual_environment/vms/fuel.xml
-    isFuel: yes
-    username: root
-    password: r00tme
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
deleted file mode 100644
index 017919d96..000000000
--- a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
+++ /dev/null
@@ -1,135 +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
-##############################################################################
-
-############################################################################### # Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: NFV OVS HA deployment
-   version: 1.0.0
-   created: Jul 12 2016
-   comment: Rebased to Fuel10
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-stack-extensions:
-   #
-   # Disable this plugin since Fuel already has newer
-   # version of openvswitch out of the box
-   #
-   # - module: fuel-plugin-ovs
-   #   module-config-name: fuel-nshovs
-   #   module-config-version: 1.0.0
-   #   module-config-override:
-   #     metadata:
-   #       versions:
-   #         - install_dpdk:
-   #             value: true
-   #           metadata:
-   #             plugin_version: 1.0.0
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  fuel:
-    FEATURE_GROUPS:
-    - experimental
-  environment:
-    net_segment_type: vlan
-  nodes:
-  - id: 1
-    interfaces: interfaces_vlan
-    role: controller
-  - id: 2
-    interfaces: interfaces_vlan
-    role: mongo,controller
-  - id: 3
-    interfaces: interfaces_vlan
-    role: ceph-osd,controller
-  - id: 4
-    interfaces: interfaces_dpdk
-    role: ceph-osd,compute
-    attributes: attributes_1
-  - id: 5
-    interfaces: interfaces_dpdk
-    role: ceph-osd,compute
-    attributes: attributes_1
-
-  attributes_1:
-    hugepages:
-      dpdk:
-        value: 1024
-      nova:
-        value:
-          '2048': 1024
-
-  network:
-    networking_parameters:
-      segmentation_type: vlan
-    networks:
-    - cidr: null
-      gateway: null
-      ip_ranges: []
-      meta:
-        configurable: false
-        map_priority: 2
-        name: private
-        neutron_vlan_range: true
-        notation: null
-        render_addr_mask: null
-        render_type: null
-        seg_type: vlan
-        use_gateway: false
-        vlan_start: null
-      name: private
-      vlan_start: null
-
-dha-override-config:
-  nodes:
-  - id: 1
-    libvirtName: controller1
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 2
-    libvirtName: controller2
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 3
-    libvirtName: controller3
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 4
-    libvirtName: compute1
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 5
-    libvirtName: compute2
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 6
-    libvirtName: fuel-master
-    libvirtTemplate: templates/virtual_environment/vms/fuel.xml
-    isFuel: yes
-    username: root
-    password: r00tme
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/ha_odl-bgpvpn_scenario.yaml b/deploy/scenario/ha_odl-bgpvpn_scenario.yaml
deleted file mode 100644
index fd30cf2ec..000000000
--- a/deploy/scenario/ha_odl-bgpvpn_scenario.yaml
+++ /dev/null
@@ -1,109 +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
-##############################################################################
-
-############################################################################### # Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: ODL HA BGPVPN deployment
-   version: 1.0.0
-   created: 29.06.2016
-   comment: Fuel ODL HA with BGPVPN, Ceph, Ceilometer and Heat Rebased for Fuel10
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-stack-extensions:
-  - module: opendaylight
-    module-config-name: fuel-odl
-    module-config-version: 1.0.0
-    module-config-override:
-      metadata:
-        versions:
-          - enable_l3_odl:
-              value: true
-            deb_version:
-              value: '5.2.0-1'
-            enable_bgpvpn:
-              value: true
-            metadata:
-              plugin_version: 1.0.0
-
-  - module: bgpvpn
-    module-config-name: fuel-bgpvpn
-    module-config-version: 1.0.0
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: controller,opendaylight
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,controller
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  settings:
-    editable:
-      public_network_assignment:
-        assign_to_all_nodes:
-          value: true
-
-
-dha-override-config:
-  nodes:
-  - id: 1
-    libvirtName: controller1
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 2
-    libvirtName: controller2
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 3
-    libvirtName: controller3
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 4
-    libvirtName: compute1
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 5
-    libvirtName: compute2
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 6
-    libvirtName: fuel-master
-    libvirtTemplate: templates/virtual_environment/vms/fuel.xml
-    isFuel: yes
-    username: root
-    password: r00tme
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
deleted file mode 100644
index 356abb07e..000000000
--- a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
+++ /dev/null
@@ -1,104 +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
-##############################################################################
-
-############################################################################### # Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: ODL-L2 HA deployment
-   version: 0.0.5
-   created: Dec 07 2016
-   comment: Rebased to Fuel10
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-stack-extensions:
-  - module: opendaylight
-    module-config-name: fuel-odl
-    module-config-version: 1.0.0
-    module-config-override:
-# Note that the module substitionion does not support arrays
-# This is a quick fix
-#   - module: opendaylight
-#     module-config-name: fuel-odl
-#     module-config-version: 0.0.2
-#     module-config-override:
-       # Module config overrides
-#       rest_api_port:
-#         value: '8282'
-#       enable_gbp:
-#         value: false
-#       enable_l3_odl:
-#         value: false
-#       enable_sfc:
-#         value: false
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: controller,opendaylight
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,controller
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-
-dha-override-config:
-  nodes:
-  - id: 1
-    libvirtName: controller1
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 2
-    libvirtName: controller2
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 3
-    libvirtName: controller3
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 4
-    libvirtName: compute1
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 5
-    libvirtName: compute2
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 6
-    libvirtName: fuel-master
-    libvirtTemplate: templates/virtual_environment/vms/fuel.xml
-    isFuel: yes
-    username: root
-    password: r00tme
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
deleted file mode 100644
index e675f2df2..000000000
--- a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
+++ /dev/null
@@ -1,124 +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
-##############################################################################
-
-############################################################################### # Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: ODL-L2 SFC HA deployment
-   version: 0.0.3
-   created: Feb 10 2016
-   comment: Rebased to Fuel10
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-stack-extensions:
-  - module: fuel-plugin-ovs
-    module-config-name: fuel-nshovs
-    module-config-version: 1.0.0
-    module-config-override:
-      metadata:
-        versions:
-          - install_nsh:
-              value: true
-            metadata:
-              plugin_version: 1.0.0
-  - module: opendaylight
-    module-config-name: fuel-odl
-    module-config-version: 1.0.0
-    module-config-override:
-      metadata:
-        versions:
-          - enable_sfc:
-              value: true
-            deb_version:
-              value: '5.2.0-1'
-            metadata:
-              plugin_version: 1.0.0
-  - module: tacker
-    module-config-name: fuel-tacker
-    module-config-version: 1.0.0
-# Note that the module substitionion does not support arrays
-# This is a quick fix
-#   - module: opendaylight
-#     module-config-name: fuel-odl
-#     module-config-version: 0.0.2
-#     module-config-override:
-       # Module config overrides
-#       rest_api_port:
-#         value: '8282'
-#       enable_gbp:
-#         value: false
-#       enable_l3_odl:
-#         value: false
-#       enable_sfc:
-#         value: false
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: controller,opendaylight
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller,tacker
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,controller
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-dha-override-config:
-  nodes:
-  - id: 1
-    libvirtName: controller1
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 2
-    libvirtName: controller2
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 3
-    libvirtName: controller3
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 4
-    libvirtName: compute1
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 5
-    libvirtName: compute2
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 6
-    libvirtName: fuel-master
-    libvirtTemplate: templates/virtual_environment/vms/fuel.xml
-    isFuel: yes
-    username: root
-    password: r00tme
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
deleted file mode 100644
index 43eb9029b..000000000
--- a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
+++ /dev/null
@@ -1,102 +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
-##############################################################################
-
-############################################################################### # Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: ODL-L3 HA deployment
-   version: 0.0.6
-   created: Dec 07 2016
-   comment: Rebased to Fuel10
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-# Note that the module substitionion does not support arrays
-# This is a quick fix
-stack-extensions:
-  - module: opendaylight
-    module-config-name: fuel-odl
-    module-config-version: 1.0.0
-    module-config-override:
-      metadata:
-        versions:
-          - enable_l3_odl:
-              value: true
-            metadata:
-              plugin_version: 1.0.0
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: controller,opendaylight
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,controller
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  settings:
-    editable:
-      public_network_assignment:
-        assign_to_all_nodes:
-          value: true
-
-dha-override-config:
-  nodes:
-  - id: 1
-    libvirtName: controller1
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 2
-    libvirtName: controller2
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 3
-    libvirtName: controller3
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 4
-    libvirtName: compute1
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 5
-    libvirtName: compute2
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 6
-    libvirtName: fuel-master
-    libvirtTemplate: templates/virtual_environment/vms/fuel.xml
-    isFuel: yes
-    username: root
-    password: r00tme
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml
deleted file mode 100644
index 7fd3fc640..000000000
--- a/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml
+++ /dev/null
@@ -1,115 +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
-##############################################################################
-
-############################################################################### # Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: ONOS HA deployment
-   version: 0.0.6
-   created: Jun 08 2016
-   comment: Rebased to Fuel9
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-stack-extensions:
-   - module: onos
-     module-config-name: fuel-onos
-     module-config-version: 0.0.3
-     module-config-override:
-       metadata:
-         class: plugin
-         default: false
-         enabled: true
-         label: onos plugin
-         toggleable: true
-         versions:
-         - enable_sfc:
-             label: SFC features
-             type: checkbox
-             value: false
-             weight: 13
-           metadata:
-             hot_pluggable: false
-             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
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  environment:
-    net_segment_type: tun
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: controller,onos
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,controller
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  settings:
-    editable:
-      public_network_assignment:
-        assign_to_all_nodes:
-          value: true
-dha-override-config:
-  nodes:
-  - id: 1
-    libvirtName: controller1
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 2
-    libvirtName: controller2
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 3
-    libvirtName: controller3
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 4
-    libvirtName: compute1
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 5
-    libvirtName: compute2
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 6
-    libvirtName: fuel-master
-    libvirtTemplate: templates/virtual_environment/vms/fuel.xml
-    isFuel: yes
-    username: root
-    password: r00tme
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml
deleted file mode 100644
index 32fbfcf6c..000000000
--- a/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml
+++ /dev/null
@@ -1,95 +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
-##############################################################################
-
-############################################################################### # Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: ONOS HA deployment
-   version: 0.0.6
-   created: Jun 08 2016
-   comment: Rebased to Fuel9
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-stack-extensions:
-   - module: onos
-     module-config-name: fuel-onos
-     module-config-version: 0.0.3
-     module-config-override:
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  environment:
-    net_segment_type: tun
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: controller,onos
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,controller
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  settings:
-    editable:
-      public_network_assignment:
-        assign_to_all_nodes:
-          value: true
-dha-override-config:
-  nodes:
-  - id: 1
-    libvirtName: controller1
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 2
-    libvirtName: controller2
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 3
-    libvirtName: controller3
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 4
-    libvirtName: compute1
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 5
-    libvirtName: compute2
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 6
-    libvirtName: fuel-master
-    libvirtTemplate: templates/virtual_environment/vms/fuel.xml
-    isFuel: yes
-    username: root
-    password: r00tme
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml
deleted file mode 100644
index d1d5191f0..000000000
--- a/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml
+++ /dev/null
@@ -1,129 +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
-##############################################################################
-
-############################################################################### # Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: OpenStack-only, HA deployment with VLAN segmentation
-   version: 0.0.2
-   created: Jan 19 2016
-   comment: Rebased to Fuel8
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-stack-extensions:
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  environment:
-    mode: ha
-    net_segment_type: vlan
-    name: opnfv-vlan-noha
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: controller
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,controller
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-
-  settings:
-    editable:
-      additional_components:
-        ceilometer:
-          description: If selected, Ceilometer component will be installed
-          label: Install Ceilometer
-          type: checkbox
-          value: true
-          weight: 40
-        heat:
-          description: ''
-          label: ''
-          type: hidden
-          value: true
-          weight: 30
-        metadata:
-          label: Additional Components
-          weight: 20
-      storage:
-        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: true
-          weight: 75
-        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: true
-          weight: 30
-
-dha-override-config:
-# These overrides only take effect for virtual deployment scenarios
-  nodes:
-  - id: 1
-    libvirtName: controller1
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 2
-    libvirtName: controller2
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 3
-    libvirtName: controller3
-    libvirtTemplate: templates/virtual_environment/vms/controller.xml
-  - id: 4
-    libvirtName: compute1
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 5
-    libvirtName: compute2
-    libvirtTemplate: templates/virtual_environment/vms/compute.xml
-  - id: 6
-    libvirtName: fuel-master
-    libvirtTemplate: templates/virtual_environment/vms/fuel.xml
-    isFuel: yes
-    username: root
-    password: r00tme
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml
deleted file mode 100644
index 801b9fca7..000000000
--- a/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml
+++ /dev/null
@@ -1,65 +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
-##############################################################################
-
-############################################################################### # Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: OpenStack-only, No-HA deployment
-   version: 0.0.2
-   created: Jan 26 2016
-   comment: Fuel OpenStack-only with Ceph, Ceilometer and Heat, No-HA deployment rebased with Fuel8
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-stack-extensions:
-  - module: congress
-    module-config-name: fuel-congress
-    module-config-version: 1.0.0
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller,congress
-  - id: 2
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-
-dha-override-config:
-#  disks:
-#    contrail: 500G
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml
deleted file mode 100644
index 4661a263d..000000000
--- a/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml
+++ /dev/null
@@ -1,151 +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
-##############################################################################
-
-############################################################################### # Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: NFV KVM NO-HA deployment
-   version: 0.0.5
-   created: Aug 03 2016
-   comment: Ceph cannot be assigned to compute, using a seperate node for it
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-stack-extensions:
-   - module: fuel-plugin-kvm
-     module-config-name: fuel-nfvkvm
-     module-config-version: 0.9.0
-     module-config-override:
-       # Module config overrides
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  environment:
-    net_segment_type: tun
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller
-  - id: 2
-    interfaces: interfaces_1
-    role: ceph-osd
-  - id: 3
-    interfaces: interfaces_1
-    role: compute
-  - id: 4
-    interfaces: interfaces_1
-    role: compute
-
-  settings:
-    editable:
-      storage:
-        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
-        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
-        iser:
-          description: 'High performance block storage: Cinder volumes over iSER protocol (iSCSI over RDMA). This feature requires SR-IOV capabilities in the NIC, and will use a dedicated virtual function for the storage network.'
-          label: iSER protocol for volumes (Cinder)
-          restrictions:
-          - settings:storage.volumes_lvm.value != true or settings:common.libvirt_type.value != 'kvm'
-          - action: hide
-            condition: not ('experimental' in version:feature_groups)
-          type: checkbox
-          value: false
-          weight: 11
-        metadata:
-          group: storage
-          label: Storage Backends
-          weight: 60
-        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 'Storage - Ceph OSD' nodes.
-          label: Ceph object replication factor
-          regex:
-            error: Invalid number
-            source: ^[1-9]\d*$
-          type: text
-          value: '1'
-          weight: 85
-        volumes_block_device:
-          description: High performance block device storage. It is recommended to have at least one Storage - 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 Storage - Cinder LVM node.
-          label: Cinder LVM over iSCSI for volumes
-          restrictions:
-          - settings:storage.volumes_ceph.value == true
-          type: checkbox
-          value: false
-          weight: 10
-
-dha-override-config:
-#  disks:
-#    contrail: 500G
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml
deleted file mode 100644
index f7e1eb46a..000000000
--- a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml
+++ /dev/null
@@ -1,133 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Intel Corp. and others.
-# navyax.bathula@intel.com,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
-##############################################################################
-
-###############################################################################
-# Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: NFV KVM OVS-DPDK and Barometer No-HA deployment
-   version: 0.0.1
-   created: Feb 16 2017
-   comment: NFV KVM OVS-DPDK and Barometer
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-stack-extensions:
-   - module: fuel-plugin-kvm
-     module-config-name: fuel-nfvkvm
-     module-config-version: 1.0.0
-     module-config-override:
-       # Module config overrides
-   - module: fuel-plugin-collectd-ceilometer
-     module-config-name: fuel-barometer
-     module-config-version: 1.0.0
-     module-config-override:
-       # Module config overrides
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  fuel:
-    FEATURE_GROUPS:
-    - experimental
-  environment:
-    net_segment_type: vlan
-  nodes:
-  - id: 1
-    interfaces: interfaces_vlan
-    role: mongo,controller
-  - id: 2
-    interfaces: interfaces_dpdk
-    role: ceph-osd,compute
-    attributes: attributes_1
-  - id: 3
-    interfaces: interfaces_dpdk
-    role: ceph-osd,compute
-    attributes: attributes_1
-  - id: 4
-    interfaces: interfaces_dpdk
-    role: ceph-osd,compute
-    attributes: attributes_1
-
-  attributes_1:
-    hugepages:
-      dpdk:
-        value: 1024
-      nova:
-        value:
-          '2048': 1024
-
-  network:
-    networking_parameters:
-      segmentation_type: vlan
-    networks:
-    - cidr: null
-      gateway: null
-      ip_ranges: []
-      meta:
-        configurable: false
-        map_priority: 2
-        name: private
-        neutron_vlan_range: true
-        notation: null
-        render_addr_mask: null
-        render_type: null
-        seg_type: vlan
-        use_gateway: false
-        vlan_start: null
-      name: private
-      vlan_start: null
-
-  settings:
-    editable:
-      storage:
-        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: true
-          weight: 75
-        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: true
-          weight: 30
-
-dha-override-config:
-#  disks:
-#    contrail: 500G
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
deleted file mode 100644
index f7144f058..000000000
--- a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
+++ /dev/null
@@ -1,128 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 Intel Corp. and others.
-# navyax.bathula@intel.com,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
-##############################################################################
-
-###############################################################################
-# Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: NFV KVM and OVS-DPDK No-HA deployment
-   version: 0.0.1
-   created: Dec 20 2016
-   comment: NFV KVM and OVS-DPDK
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-stack-extensions:
-   - module: fuel-plugin-kvm
-     module-config-name: fuel-nfvkvm
-     module-config-version: 1.0.0
-     module-config-override:
-       # Module config overrides
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  fuel:
-    FEATURE_GROUPS:
-    - experimental
-  environment:
-    net_segment_type: vlan
-  nodes:
-  - id: 1
-    interfaces: interfaces_vlan
-    role: mongo,controller
-  - id: 2
-    interfaces: interfaces_dpdk
-    role: ceph-osd,compute
-    attributes: attributes_1
-  - id: 3
-    interfaces: interfaces_dpdk
-    role: ceph-osd,compute
-    attributes: attributes_1
-  - id: 4
-    interfaces: interfaces_dpdk
-    role: ceph-osd,compute
-    attributes: attributes_1
-
-  attributes_1:
-    hugepages:
-      dpdk:
-        value: 1024
-      nova:
-        value:
-          '2048': 1024
-
-  network:
-    networking_parameters:
-      segmentation_type: vlan
-    networks:
-    - cidr: null
-      gateway: null
-      ip_ranges: []
-      meta:
-        configurable: false
-        map_priority: 2
-        name: private
-        neutron_vlan_range: true
-        notation: null
-        render_addr_mask: null
-        render_type: null
-        seg_type: vlan
-        use_gateway: false
-        vlan_start: null
-      name: private
-      vlan_start: null
-
-  settings:
-    editable:
-      storage:
-        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: true
-          weight: 75
-        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: true
-          weight: 30
-
-dha-override-config:
-#  disks:
-#    contrail: 500G
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml
deleted file mode 100644
index 87364e83a..000000000
--- a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml
+++ /dev/null
@@ -1,114 +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
-##############################################################################
-
-############################################################################### # Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: NFV KVM and OVS No-HA deployment
-   version: 0.0.1
-   created: Jan 6 2016
-   comment: NFV KVM and OVS
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-stack-extensions:
-   - module: fuel-plugin-qemu
-     module-config-name: fuel-nfvkvm
-     module-config-version: 0.0.1
-     module-config-override:
-       # Module config overrides
-
-   - module: fuel-plugin-ovsnfv
-     module-config-name: fuel-nfvovs
-     module-config-version: 0.0.1
-     module-config-override:
-       # Module config overrides
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  environment:
-    mode: ha
-    net_segment_type: tun
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller
-  - id: 2
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  settings:
-    editable:
-      additional_components:
-        ceilometer:
-          description: If selected, Ceilometer component will be installed
-          label: Install Ceilometer
-          type: checkbox
-          value: true
-          weight: 40
-        heat:
-          description: ''
-          label: ''
-          type: hidden
-          value: true
-          weight: 30
-        metadata:
-          label: Additional Components
-          weight: 20
-      storage:
-        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: true
-          weight: 75
-        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: true
-          weight: 30
-
-dha-override-config:
-#  disks:
-#    contrail: 500G
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
deleted file mode 100644
index 526052779..000000000
--- a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
+++ /dev/null
@@ -1,113 +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
-##############################################################################
-
-############################################################################### # Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: NFV OVS NO-HA deployment
-   version: 1.0.0
-   created: Jul 12 2016
-   comment: NFV OVS NO-HA Rebased for Fuel10
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-stack-extensions:
-   #
-   # Disable this plugin since Fuel already has newer
-   # version of openvswitch out of the box
-   #
-   # - module: fuel-plugin-ovs
-   #   module-config-name: fuel-nshovs
-   #   module-config-version: 1.0.0
-   #   module-config-override:
-   #     metadata:
-   #       versions:
-   #         - install_dpdk:
-   #             value: true
-   #           metadata:
-   #             plugin_version: 1.0.0
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  fuel:
-    FEATURE_GROUPS:
-    - experimental
-  environment:
-    net_segment_type: vlan
-  nodes:
-  - id: 1
-    interfaces: interfaces_vlan
-    role: mongo,controller
-  - id: 2
-    interfaces: interfaces_dpdk
-    role: ceph-osd,compute
-    attributes: attributes_1
-  - id: 3
-    interfaces: interfaces_dpdk
-    role: ceph-osd,compute
-    attributes: attributes_1
-  - id: 4
-    interfaces: interfaces_dpdk
-    role: ceph-osd,compute
-    attributes: attributes_1
-
-  attributes_1:
-    hugepages:
-      dpdk:
-        value: 1024
-      nova:
-        value:
-          '2048': 1024
-
-  network:
-    networking_parameters:
-      segmentation_type: vlan
-    networks:
-    - cidr: null
-      gateway: null
-      ip_ranges: []
-      meta:
-        configurable: false
-        map_priority: 2
-        name: private
-        neutron_vlan_range: true
-        notation: null
-        render_addr_mask: null
-        render_type: null
-        seg_type: vlan
-        use_gateway: false
-        vlan_start: null
-      name: private
-      vlan_start: null
-
-dha-override-config:
-#  disks:
-#    contrail: 500G
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml b/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
deleted file mode 100644
index bc2dab5b9..000000000
--- a/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
+++ /dev/null
@@ -1,86 +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
-##############################################################################
-
-############################################################################### # Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: ODL HA BGPVPN deployment
-   version: 1.0.0
-   created: 29.06.2016
-   comment: Fuel ODL No HA with BGPVPN, Ceph, Ceilometer and Heat Rebased for Fuel10
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-stack-extensions:
-  - module: opendaylight
-    module-config-name: fuel-odl
-    module-config-version: 1.0.0
-    module-config-override:
-      metadata:
-        versions:
-          - enable_l3_odl:
-              value: true
-            deb_version:
-              value: '5.2.0-1'
-            enable_bgpvpn:
-              value: true
-            metadata:
-              plugin_version: 1.0.0
-
-  - module: bgpvpn
-    module-config-name: fuel-bgpvpn
-    module-config-version: 1.0.0
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller
-  - id: 2
-    interfaces: interfaces_1
-    role: ceph-osd,opendaylight
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  settings:
-    editable:
-      public_network_assignment:
-        assign_to_all_nodes:
-          value: true
-
-dha-override-config:
-#  disks:
-#    contrail: 500G
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
deleted file mode 100644
index 903aa57fb..000000000
--- a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
+++ /dev/null
@@ -1,82 +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
-##############################################################################
-
-############################################################################### # Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: ODL-L2 No-HA deployment
-   version: 0.0.4
-   created: Dec 07 2016
-   comment: Rebased to Fuel10
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-stack-extensions:
-  - module: opendaylight
-    module-config-name: fuel-odl
-    module-config-version: 1.0.0
-    module-config-override:
-# Note that the module substitionion does not support arrays
-# This is a quick fix
-#   - module: opendaylight
-#     module-config-name: fuel-odl
-#     module-config-version: 0.0.2
-#     module-config-override:
-#       # Module config overrides
-#       rest_api_port:
-#         value: '8282'
-#       enable_gbp:
-#         value: false
-#       enable_l3_odl:
-#         value: false
-#       enable_sfc:
-#         value: false
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller
-  - id: 2
-    interfaces: interfaces_1
-    role: ceph-osd,opendaylight
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-
-dha-override-config:
-#  disks:
-#    contrail: 500G
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
deleted file mode 100644
index 29d9383e5..000000000
--- a/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
+++ /dev/null
@@ -1,103 +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
-##############################################################################
-
-############################################################################### # Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: ODL-L2-SFC No-HA deployment
-   version: 0.0.4
-   created: Feb 10 2016
-   comment: Fuel ODL-L2 SFC No HA with Ceph, Ceilometer and Heat Rebased for Fuel10
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-stack-extensions:
-  - module: fuel-plugin-ovs
-    module-config-name: fuel-nshovs
-    module-config-version: 1.0.0
-    module-config-override:
-      metadata:
-        versions:
-          - install_nsh:
-              value: true
-            metadata:
-              plugin_version: 1.0.0
-  - module: opendaylight
-    module-config-name: fuel-odl
-    module-config-version: 1.0.0
-    module-config-override:
-      metadata:
-        versions:
-          - enable_sfc:
-              value: true
-            deb_version:
-              value: '5.2.0-1'
-            metadata:
-              plugin_version: 1.0.0
-  - module: tacker
-    module-config-name: fuel-tacker
-    module-config-version: 1.0.0
-
-# Note that the module substitionion does not support arrays
-# This is a quick fix
-#   - module: opendaylight
-#     module-config-name: fuel-odl
-#     module-config-version: 0.0.2
-#     module-config-override:
-#       # Module config overrides
-#       rest_api_port:
-#         value: '8282'
-#       enable_gbp:
-#         value: false
-#       enable_l3_odl:
-#         value: false
-#       enable_sfc:
-#         value: false
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller,tacker
-  - id: 2
-    interfaces: interfaces_1
-    role: ceph-osd,opendaylight
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-
-dha-override-config:
-#  disks:
-#    contrail: 500G
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
deleted file mode 100644
index 3353d6744..000000000
--- a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
+++ /dev/null
@@ -1,79 +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
-##############################################################################
-
-############################################################################### # Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: ODL-L3 No-HA deployment
-   version: 0.0.5
-   created: Dec 07 2016
-   comment: Rebased to Fuel10
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-# Note that the module substitionion does not support arrays
-# This is a quick fix
-stack-extensions:
-  - module: opendaylight
-    module-config-name: fuel-odl
-    module-config-version: 1.0.0
-    module-config-override:
-      metadata:
-        versions:
-          - enable_l3_odl:
-              value: true
-            metadata:
-              plugin_version: 1.0.0
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller
-  - id: 2
-    interfaces: interfaces_1
-    role: ceph-osd,opendaylight
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  settings:
-    editable:
-      public_network_assignment:
-        assign_to_all_nodes:
-          value: true
-
-dha-override-config:
-#  disks:
-#    contrail: 500G
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml
deleted file mode 100644
index 962b59701..000000000
--- a/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml
+++ /dev/null
@@ -1,93 +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
-##############################################################################
-
-############################################################################### # Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: ONOS No-HA deployment
-   version: 0.0.5
-   created: Jun 08 2016
-   comment: ONOS No HA with Ceph, Ceilometer and Heat - Rebased for Fuel9
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-stack-extensions:
-   - module: onos
-     module-config-name: fuel-onos
-     module-config-version: 0.0.3
-     module-config-override:
-       metadata:
-         class: plugin
-         default: false
-         enabled: true
-         label: onos plugin
-         toggleable: true
-         versions:
-         - enable_sfc:
-             label: SFC features
-             type: checkbox
-             value: false
-             weight: 13
-           metadata:
-             hot_pluggable: false
-             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
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  environment:
-    net_segment_type: tun
-    name: onos_no-ha
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller,onos
-  - id: 2
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  settings:
-    editable:
-      public_network_assignment:
-        assign_to_all_nodes:
-          value: true
-dha-override-config:
-#  disks:
-#    contrail: 500G
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml
deleted file mode 100644
index 587346ef4..000000000
--- a/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml
+++ /dev/null
@@ -1,73 +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
-##############################################################################
-
-############################################################################### # Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: ONOS No-HA deployment
-   version: 0.0.5
-   created: Jun 08 2016
-   comment: ONOS No HA with Ceph, Ceilometer and Heat - Rebased for Fuel9
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-stack-extensions:
-   - module: onos
-     module-config-name: fuel-onos
-     module-config-version: 0.0.3
-     module-config-override:
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  environment:
-    net_segment_type: tun
-    name: onos_no-ha
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller,onos
-  - id: 2
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  settings:
-    editable:
-      public_network_assignment:
-        assign_to_all_nodes:
-          value: true
-dha-override-config:
-#  disks:
-#    contrail: 500G
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml
deleted file mode 100644
index 567ea9867..000000000
--- a/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml
+++ /dev/null
@@ -1,103 +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
-##############################################################################
-
-############################################################################### # Description:
-# This .yaml configuration file defines the configuration of the fuel
-# deployment and is passed as an argument to deploy.sh
-# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
-# This will make build.sh fetch this configuration file and configure the
-# deployment accordingly.
-# After the deployment, a copy of this file gets uploaded to fuel:
-# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
-# /root/deploy-config.sha1
-##############################################################################
-
-##############################################################################
-# deployment configuration meta-data
-deployment-scenario-metadata:
-   title: OpenStack-only, No-HA deployment with VLAN segmentation
-   version: 0.0.1
-   created: Jan 12 2016
-   comment: Fuel OpenStack-only with VLAN segmentation, Ceph, Ceilometer and Heat, No-HA deployment
-
-##############################################################################
-# Stack extentions are opnfv added value features in form of a fuel-plugin
-# plug-ins listed below will be enabled and configured according to the
-# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
-# It does so by copying the config file to the local plugin config directory
-stack-extensions:
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  environment:
-    mode: ha
-    net_segment_type: vlan
-    name: opnfv-vlan-noha
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller
-  - id: 2
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-  settings:
-    editable:
-      additional_components:
-        ceilometer:
-          description: If selected, Ceilometer component will be installed
-          label: Install Ceilometer
-          type: checkbox
-          value: true
-          weight: 40
-        heat:
-          description: ''
-          label: ''
-          type: hidden
-          value: true
-          weight: 30
-        metadata:
-          label: Additional Components
-          weight: 20
-      storage:
-        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: true
-          weight: 75
-        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: true
-          weight: 30
-
-dha-override-config:
-# These overrides only take effect for virtual deployment scenarios
-
-##############################################################################
-# The verification pipeline may populate the section below with arbitrary
-# testing information, which post deploy can be retreived from the fuel master:
-# /root/deploy-config.yaml
-test:
diff --git a/deploy/scenario/scenario.yaml b/deploy/scenario/scenario.yaml
deleted file mode 100644
index 66d32da68..000000000
--- a/deploy/scenario/scenario.yaml
+++ /dev/null
@@ -1,95 +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
-##############################################################################
-
-##############################################################################
-# Description:
-# This configuration file defines translation between a short deployment
-# scenario name and an actual deployment scenario configuration file
-#
-# Short deployment scenario names are aligned between installer, test, and
-# releng projects according to below pattern.
-#   os-[controller]-[feature]-[mode](-[optionalparameter])
-#
-# Please note that the mechanism to get the details regarding the scenarios
-# is different currently which needs to be aligned as well.
-##############################################################################
-
-##############################################################################
-# Short scenario name convention to be followed:
-# os-<controller>-<feature>-<mode>[-<optional-parameter>]
-# controler: nosdn|odl|onos|ocl|...
-# feaure: nofeature | [vlan]_[kvm]_[ovs]_[vlan]_....
-# mode: ha|noha
-##############################################################################
-
-os-nosdn-nofeature-ha:
-  configfile: ha_heat_ceilometer_scenario.yaml
-
-os-nosdn-nofeature-noha:
-  configfile: no-ha_heat_ceilometer_scenario.yaml
-
-os-odl_l3-nofeature-ha:
-  configfile: ha_odl-l3_heat_ceilometer_scenario.yaml
-
-os-odl_l3-nofeature-noha:
-  configfile: no-ha_odl-l3_heat_ceilometer_scenario.yaml
-
-os-odl_l2-nofeature-ha:
-  configfile: ha_odl-l2_heat_ceilometer_scenario.yaml
-
-os-odl_l2-nofeature-noha:
-  configfile: no-ha_odl-l2_heat_ceilometer_scenario.yaml
-
-os-onos-nofeature-ha:
-  configfile: ha_onos_nofeature_heat_ceilometer_scenario.yaml
-
-os-onos-nofeature-noha:
-  configfile: no-ha_onos_nofeature_heat_ceilometer_scenario.yaml
-
-os-onos-sfc-ha:
-  configfile: ha_onos_sfc_heat_ceilometer_scenario.yaml 
-
-os-onos-sfc-noha:
-  configfile: no-ha_onos_sfc_heat_ceilometer_scenario.yaml
-
-os-nosdn-kvm-ha:
-  configfile: ha_nfv-kvm_heat_ceilometer_scenario.yaml
-
-os-nosdn-kvm-noha:
-  configfile: no-ha_nfv-kvm_heat_ceilometer_scenario.yaml
-
-os-nosdn-ovs-ha:
-  configfile: ha_nfv-ovs_heat_ceilometer_scenario.yaml
-
-os-nosdn-ovs-noha:
-  configfile: no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
-
-os-odl_l2-bgpvpn-ha:
-  configfile: ha_odl-bgpvpn_scenario.yaml
-
-os-odl_l2-bgpvpn-noha:
-  configfile: no-ha_odl-bgpvpn_scenario.yaml
-
-os-odl_l2-sfc-ha:
-  configfile: ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
-
-os-odl_l2-sfc-noha:
-  configfile: no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
-
-os-nosdn-kvm_ovs_dpdk-ha:
-  configfile: ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
-
-os-nosdn-kvm_ovs_dpdk-noha:
-  configfile: no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
-
-os-nosdn-kvm_ovs_dpdk_bar-ha:
-  configfile: ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml
-
-os-nosdn-kvm_ovs_dpdk_bar-noha:
-  configfile: no-ha_nfv-kvm_nfv-ovs-dpdk-bar_heat_ceilometer_scenario.yaml