Clean up scenario files

 - remove release from scenario files
 - remove old versions of scenario files
 - remove versions from scenario file names and update scenario.yaml
 - update README

Change-Id: I5203ea0794b96fb44f6a9db25b33e5066c1d9574
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>

54 files changed, 19 insertions, 3949 deletions

diff --git a/deploy/scenario/README b/deploy/scenario/README
index aebeb40ee..3472f6630 100644
--- a/deploy/scenario/README
+++ b/deploy/scenario/README
@@ -20,7 +20,7 @@ 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>_<version>.yaml.
+fuel-<plugin_name>.yaml.
 The plugin configuration must include plugin configuration metadata as below:
 
 plugin-config-metadata:
@@ -42,7 +42,7 @@ 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>_<version>.yaml
+format: <ha | no-ha>_<SDN Controller>_<feature-1>_..._<feature-n>.yaml
 
 The deployment configuration file must contain configuration metadata as stated
 below:
@@ -89,7 +89,6 @@ dea-override-config:
   environment:
     mode: ha
     net_segment_type: tun
-  wanted_release: Kilo on Ubuntu 14.04
   nodes:
   - id: 1
     interfaces: interfaces_1
@@ -162,4 +161,4 @@ 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.
\ No newline at end of file
+deploy.sh will clone this repo when deploying.
diff --git a/deploy/scenario/ha_heat_ceilometer_scenario_0.0.3.yaml b/deploy/scenario/ha_heat_ceilometer_scenario.yaml
index 8ab5f9277..8ab5f9277 100644
--- a/deploy/scenario/ha_heat_ceilometer_scenario_0.0.3.yaml
+++ b/deploy/scenario/ha_heat_ceilometer_scenario.yaml
diff --git a/deploy/scenario/ha_heat_ceilometer_scenario_0.0.1.yaml b/deploy/scenario/ha_heat_ceilometer_scenario_0.0.1.yaml
deleted file mode 100644
index ae2432edc..000000000
--- a/deploy/scenario/ha_heat_ceilometer_scenario_0.0.1.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: OpenStack-only, HA deployment
-   version: 0.0.1
-   created: December 29 2015
-   comment: Fuel OpenStack-only with Ceph, Ceilometer and Heat, 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: tun
-  wanted_release: Kilo on Ubuntu 14.04
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-
-  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/ha_heat_ceilometer_scenario_0.0.2.yaml b/deploy/scenario/ha_heat_ceilometer_scenario_0.0.2.yaml
deleted file mode 100644
index 6a33dd819..000000000
--- a/deploy/scenario/ha_heat_ceilometer_scenario_0.0.2.yaml
+++ /dev/null
@@ -1,134 +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.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: tun
-  wanted_release: Kilo on Ubuntu 14.04
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: controller
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo, controller
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,controller
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-
-  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:
-  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_0.0.5.yaml b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
index 2941a726e..2941a726e 100644
--- a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario_0.0.5.yaml
+++ b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
diff --git a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario_0.0.1.yaml b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario_0.0.1.yaml
deleted file mode 100644
index e07fd0d1a..000000000
--- a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario_0.0.1.yaml
+++ /dev/null
@@ -1,117 +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.1
-   created: Jan 6 2016
-   comment: NFV KVM HA
-
-##############################################################################
-# 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
-
-##############################################################################
-# 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
-  wanted_release: Kilo on Ubuntu 14.04
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  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/ha_nfv-kvm_heat_ceilometer_scenario_0.0.2.yaml b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario_0.0.2.yaml
deleted file mode 100644
index 525fc51ad..000000000
--- a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario_0.0.2.yaml
+++ /dev/null
@@ -1,138 +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.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:
-   - module: fuel-plugin-qemu
-     module-config-name: fuel-nfvkvm
-     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
-  wanted_release: Kilo on Ubuntu 14.04
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: controller
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  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:
-  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_0.0.3.yaml b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario_0.0.3.yaml
deleted file mode 100644
index b653cad5c..000000000
--- a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario_0.0.3.yaml
+++ /dev/null
@@ -1,97 +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.3
-   created: Jan 28 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: fuel-plugin-qemu
-     module-config-name: fuel-nfvkvm
-     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:
-    net_segment_type: tun
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: controller
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-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_0.0.4.yaml b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario_0.0.4.yaml
deleted file mode 100644
index 85098a5f6..000000000
--- a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario_0.0.4.yaml
+++ /dev/null
@@ -1,180 +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.4
-   created: Feb 9 2016
-   comment: Rebased to Fuel8 and the new KVM QEMU plugin verssion
-
-##############################################################################
-# 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.2
-     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
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: controller
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: controller
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: compute
-    transformations: transformations_1
-  - id: 5
-    interfaces: interfaces_1
-    role: compute
-    transformations: transformations_1
-
-  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: '3'
-          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: false
-          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-ovs_heat_ceilometer_scenario_0.0.5.yaml b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
index 66b07d5b8..66b07d5b8 100644
--- a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario_0.0.5.yaml
+++ b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
diff --git a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario_0.0.1.yaml b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario_0.0.1.yaml
deleted file mode 100644
index 1419858cb..000000000
--- a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario_0.0.1.yaml
+++ /dev/null
@@ -1,117 +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: 0.0.1
-   created: Jan 6 2016
-   comment: NFV OVS HA
-
-##############################################################################
-# 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-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
-  wanted_release: Kilo on Ubuntu 14.04
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  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/ha_nfv-ovs_heat_ceilometer_scenario_0.0.2.yaml b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario_0.0.2.yaml
deleted file mode 100644
index 57bbe406d..000000000
--- a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario_0.0.2.yaml
+++ /dev/null
@@ -1,137 +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: 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:
-   - 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
-  wanted_release: Kilo on Ubuntu 14.04
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: controller
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,controller
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  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:
-  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_0.0.3.yaml b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml
deleted file mode 100644
index 22cd91df9..000000000
--- a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml
+++ /dev/null
@@ -1,96 +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: 0.0.3
-   created: Jan 29 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: 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:
-    net_segment_type: tun
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: controller
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,controller
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-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_0.0.4.yaml b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario_0.0.4.yaml
deleted file mode 100644
index b6197efa5..000000000
--- a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario_0.0.4.yaml
+++ /dev/null
@@ -1,96 +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: 0.0.4
-   created: Feb 15 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: fuel-plugin-ovsnfv
-     module-config-name: fuel-nfvovs
-     module-config-version: 0.0.2
-     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: controller
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,controller
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-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_0.0.1.yaml b/deploy/scenario/ha_odl-bgpvpn_scenario.yaml
index c0343a617..c0343a617 100644
--- a/deploy/scenario/ha_odl-bgpvpn_scenario_0.0.1.yaml
+++ b/deploy/scenario/ha_odl-bgpvpn_scenario.yaml
diff --git a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario_0.0.3.yaml b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
index 14316df2d..14316df2d 100644
--- a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario_0.0.3.yaml
+++ b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
diff --git a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario_0.0.1.yaml b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario_0.0.1.yaml
deleted file mode 100644
index 9b1d077d2..000000000
--- a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario_0.0.1.yaml
+++ /dev/null
@@ -1,126 +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.1
-   created: Jan 5 2016
-   comment: Fuel ODL-L2 HA with Ceph, Ceilometer and Heat
-
-##############################################################################
-# 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: 0.0.1
-     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:
-  environment:
-    mode: ha
-    net_segment_type: tun
-  wanted_release: Kilo on Ubuntu 14.04
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller,opendaylight
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-
-  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/ha_odl-l2_heat_ceilometer_scenario_0.0.2.yaml b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario_0.0.2.yaml
deleted file mode 100644
index e79283b86..000000000
--- a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario_0.0.2.yaml
+++ /dev/null
@@ -1,146 +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.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:
-   - 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: false
-       enable_sfc:
-         value: false
-
-##############################################################################
-# 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
-  wanted_release: Kilo on Ubuntu 14.04
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: controller,opendaylight
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,controller
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-
-  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:
-  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_0.0.1.yaml b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
index 70b91e71e..70b91e71e 100644
--- a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml
+++ b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
diff --git a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario_0.0.4.yaml b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
index 0f09ca478..0f09ca478 100644
--- a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario_0.0.4.yaml
+++ b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
diff --git a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario_0.0.1.yaml b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario_0.0.1.yaml
deleted file mode 100644
index a0f68097d..000000000
--- a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario_0.0.1.yaml
+++ /dev/null
@@ -1,126 +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.1
-   created: Jan 5 2016
-   comment: Fuel ODL-L3 HA with Ceph, Ceilometer and Heat
-
-##############################################################################
-# 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: 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
-
-##############################################################################
-# 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
-  wanted_release: Kilo on Ubuntu 14.04
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller,opendaylight
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-
-  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/ha_odl-l3_heat_ceilometer_scenario_0.0.2.yaml b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario_0.0.2.yaml
deleted file mode 100644
index be54d4084..000000000
--- a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario_0.0.2.yaml
+++ /dev/null
@@ -1,146 +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.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:
-   - 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
-
-##############################################################################
-# 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
-  wanted_release: Kilo on Ubuntu 14.04
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: controller,opendaylight
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,controller
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-
-  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:
-  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_0.0.3.yaml b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario_0.0.3.yaml
deleted file mode 100644
index 96623309b..000000000
--- a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario_0.0.3.yaml
+++ /dev/null
@@ -1,107 +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.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: 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: true
-       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
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,controller
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  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_heat_ceilometer_scenario_0.0.5.yaml b/deploy/scenario/ha_onos_heat_ceilometer_scenario.yaml
index a94f48b87..a94f48b87 100644
--- a/deploy/scenario/ha_onos_heat_ceilometer_scenario_0.0.5.yaml
+++ b/deploy/scenario/ha_onos_heat_ceilometer_scenario.yaml
diff --git a/deploy/scenario/ha_onos_heat_ceilometer_scenario_0.0.1.yaml b/deploy/scenario/ha_onos_heat_ceilometer_scenario_0.0.1.yaml
deleted file mode 100644
index 8fc4e2229..000000000
--- a/deploy/scenario/ha_onos_heat_ceilometer_scenario_0.0.1.yaml
+++ /dev/null
@@ -1,120 +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.1
-   created: Jan 7 2016
-   comment: Fuel ONOS HA with Ceph, Ceilometer and Heat
-
-##############################################################################
-# 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.1
-     module-config-override:
-       # Module config overrides
-       public_eth:
-         value: 'eth3'
-
-##############################################################################
-# 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
-  wanted_release: Kilo on Ubuntu 14.04
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller,onos
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-
-  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/ha_onos_heat_ceilometer_scenario_0.0.2.yaml b/deploy/scenario/ha_onos_heat_ceilometer_scenario_0.0.2.yaml
deleted file mode 100644
index df1f1e7a7..000000000
--- a/deploy/scenario/ha_onos_heat_ceilometer_scenario_0.0.2.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: ONOS HA deployment
-   version: 0.0.2
-   created: Jan 10 2016
-   comment: Fuel ONOS HA with Ceph, Ceilometer and Heat
-
-##############################################################################
-# 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.1
-     module-config-override:
-       # Module config overrides
-       public_eth:
-         value: 'eth3'
-
-##############################################################################
-# By editing the override-config sections below, you can override arbitrary
-# configuration name-space settings
-dea-override-config:
-  environment:
-    name: onos_ha
-    mode: ha
-    net_segment_type: tun
-  wanted_release: Kilo on Ubuntu 14.04
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller,onos
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_2
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_2
-
-# Unique network transformation for ONOS deployment
-  transformations_2:
-    transformations:
-    - action: add-br
-      name: br-fw-admin
-    - action: add-br
-      name: br-mgmt
-    - action: add-br
-      name: br-storage
-    - action: add-br
-      name: br-mesh
-    - action: add-port
-      bridge: br-fw-admin
-      name: eth0
-    - action: add-port
-      bridge: br-mgmt
-      name: eth0.101
-    - action: add-port
-      bridge: br-storage
-      name: eth1.102
-    - action: add-port
-      bridge: br-mesh
-      name: eth2.103
-
-  settings:
-    editable:
-      common:
-        libvirt_type:
-          # ONOS requires QEMU
-          value: qemu
-      public_network_assignment:
-        assign_to_all_nodes:
-          # ONOS should not have public network assignment to all nodes
-          value: false
-      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:
-  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_heat_ceilometer_scenario_0.0.3.yaml b/deploy/scenario/ha_onos_heat_ceilometer_scenario_0.0.3.yaml
deleted file mode 100644
index eeb99b2a3..000000000
--- a/deploy/scenario/ha_onos_heat_ceilometer_scenario_0.0.3.yaml
+++ /dev/null
@@ -1,140 +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.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:
-   - module: onos
-     module-config-name: fuel-onos
-     module-config-version: 0.0.1
-     module-config-override:
-       # Module config overrides
-       public_eth:
-         value: 'eth3'
-
-##############################################################################
-# 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
-  wanted_release: Kilo on Ubuntu 14.04
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: controller,onos
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,controller
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-
-  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:
-  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_heat_ceilometer_scenario_0.0.4.yaml b/deploy/scenario/ha_onos_heat_ceilometer_scenario_0.0.4.yaml
deleted file mode 100644
index a115bb643..000000000
--- a/deploy/scenario/ha_onos_heat_ceilometer_scenario_0.0.4.yaml
+++ /dev/null
@@ -1,105 +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.4
-   created: Jan 29 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: onos
-     module-config-name: fuel-onos
-     module-config-version: 0.0.2
-     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
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,controller
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_2
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_2
-  settings:
-    editable:
-      common:
-        libvirt_type:
-          # ONOS requires QEMU
-          value: qemu
-      public_network_assignment:
-        assign_to_all_nodes:
-          # ONOS should not have public network assignment to all nodes
-          value: false
-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_0.0.2.yaml b/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml
index 9691c7920..dc7868b56 100644
--- a/deploy/scenario/ha_vlan_heat_ceilometer_scenario_0.0.2.yaml
+++ b/deploy/scenario/ha_vlan_heat_ceilometer_scenario.yaml
@@ -41,7 +41,6 @@ dea-override-config:
     mode: ha
     net_segment_type: vlan
     name: opnfv-vlan-noha
-  wanted_release: Kilo on Ubuntu 14.04
   nodes:
   - id: 1
     interfaces: interfaces_1
diff --git a/deploy/scenario/ha_vlan_heat_ceilometer_scenario_0.0.1.yaml b/deploy/scenario/ha_vlan_heat_ceilometer_scenario_0.0.1.yaml
deleted file mode 100644
index c6f221284..000000000
--- a/deploy/scenario/ha_vlan_heat_ceilometer_scenario_0.0.1.yaml
+++ /dev/null
@@ -1,134 +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.1
-   created: Jan 12 2016
-   comment: Fuel OpenStack-only with Ceph, Ceilometer and Heat, 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
-  wanted_release: Kilo on Ubuntu 14.04
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 5
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-
-  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_0.0.2.yaml b/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml
index c21585979..c21585979 100644
--- a/deploy/scenario/no-ha_heat_ceilometer_scenario_0.0.2.yaml
+++ b/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml
diff --git a/deploy/scenario/no-ha_heat_ceilometer_scenario_0.0.1.yaml b/deploy/scenario/no-ha_heat_ceilometer_scenario_0.0.1.yaml
deleted file mode 100644
index 76595e8db..000000000
--- a/deploy/scenario/no-ha_heat_ceilometer_scenario_0.0.1.yaml
+++ /dev/null
@@ -1,108 +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.1
-   created: December 29 2015
-   comment: Fuel OpenStack-only with 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: tun
-  wanted_release: Kilo on Ubuntu 14.04
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  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-kvm_heat_ceilometer_scenario_0.0.4.yaml b/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml
index 08fc041e3..08fc041e3 100644
--- a/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.4.yaml
+++ b/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario.yaml
diff --git a/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.1.yaml b/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.1.yaml
deleted file mode 100644
index 04306c24b..000000000
--- a/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.1.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 KVM NO-HA deployment
-   version: 0.0.1
-   created: Jan 6 2016
-   comment: NFV KVM NO-HA
-
-##############################################################################
-# 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
-
-##############################################################################
-# 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
-  wanted_release: Kilo on Ubuntu 14.04
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  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-kvm_heat_ceilometer_scenario_0.0.2.yaml b/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.2.yaml
deleted file mode 100644
index 74e20c2d6..000000000
--- a/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.2.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: NFV KVM NO-HA deployment
-   version: 0.0.2
-   created: Jan 28 2016
-   comment: NFV KVM NO-HA Rebased for 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: fuel-plugin-qemu
-     module-config-name: fuel-nfvkvm
-     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:
-    net_segment_type: tun
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-
-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_0.0.3.yaml b/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.3.yaml
deleted file mode 100644
index a3d6e0188..000000000
--- a/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.3.yaml
+++ /dev/null
@@ -1,155 +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.3
-   created: Feb 9 2016
-   comment: NFV KVM NO-HA Rebased for Fuel8 and the new qemu plugin version
-
-##############################################################################
-# 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.2
-     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
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: compute
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: compute
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: compute
-    transformations: transformations_1
-
-  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: '3'
-          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: false
-          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_heat_ceilometer_scenario_0.0.1.yaml b/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml
index 96b6f87f6..56251215a 100644
--- a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario_0.0.1.yaml
+++ b/deploy/scenario/no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario.yaml
@@ -51,7 +51,6 @@ dea-override-config:
   environment:
     mode: ha
     net_segment_type: tun
-  wanted_release: Kilo on Ubuntu 14.04
   nodes:
   - id: 1
     interfaces: interfaces_1
diff --git a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.4.yaml b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
index 73813d128..73813d128 100644
--- a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.4.yaml
+++ b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
diff --git a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.1.yaml b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.1.yaml
deleted file mode 100644
index f8f68adfe..000000000
--- a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.1.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: 0.0.1
-   created: Jan 6 2016
-   comment: NFV OVS NO-HA
-
-##############################################################################
-# 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-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
-  wanted_release: Kilo on Ubuntu 14.04
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  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_0.0.2.yaml b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.2.yaml
deleted file mode 100644
index 18986a839..000000000
--- a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.2.yaml
+++ /dev/null
@@ -1,72 +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: 0.0.2
-   created: Jan 29 2016
-   comment: NFV OVS NO-HA Rebased for 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: 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:
-    net_segment_type: tun
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-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_0.0.3.yaml b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml
deleted file mode 100644
index 5a1c028f1..000000000
--- a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml
+++ /dev/null
@@ -1,72 +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: 0.0.3
-   created: Feb 15 2016
-   comment: NFV OVS NO-HA Rebased for 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: fuel-plugin-ovsnfv
-     module-config-name: fuel-nfvovs
-     module-config-version: 0.0.2
-     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
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-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_0.0.1.yaml b/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
index 067da4761..067da4761 100644
--- a/deploy/scenario/no-ha_odl-bgpvpn_scenario_0.0.1.yaml
+++ b/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
diff --git a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario_0.0.2.yaml b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
index 0cc1258b7..0cc1258b7 100644
--- a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario_0.0.2.yaml
+++ b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
diff --git a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario_0.0.1.yaml b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario_0.0.1.yaml
deleted file mode 100644
index f3e22906f..000000000
--- a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario_0.0.1.yaml
+++ /dev/null
@@ -1,121 +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.1
-   created: December 30 2015
-   comment: Fuel ODL-L2 No HA with Ceph, Ceilometer and Heat
-
-##############################################################################
-# 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: 0.0.1
-     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:
-  environment:
-    mode: ha
-    net_segment_type: tun
-  wanted_release: Kilo on Ubuntu 14.04
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller,opendaylight
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  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_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
index 028aa15dd..028aa15dd 100644
--- a/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml
+++ b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
diff --git a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario_0.0.3.yaml b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
index 2ba2d6d75..2ba2d6d75 100644
--- a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario_0.0.3.yaml
+++ b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
diff --git a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario_0.0.1.yaml b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario_0.0.1.yaml
deleted file mode 100644
index 880938935..000000000
--- a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario_0.0.1.yaml
+++ /dev/null
@@ -1,121 +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.1
-   created: Jan 5 2016
-   comment: Fuel ODL-L3 No HA with Ceph, Ceilometer and Heat
-
-##############################################################################
-# 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: 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
-
-##############################################################################
-# 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
-  wanted_release: Kilo on Ubuntu 14.04
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller,opendaylight
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  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_odl-l3_heat_ceilometer_scenario_0.0.2.yaml b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario_0.0.2.yaml
deleted file mode 100644
index 414aacaf1..000000000
--- a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario_0.0.2.yaml
+++ /dev/null
@@ -1,83 +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.2
-   created: Jan 26 2016
-   comment: Fuel ODL-L3 No HA with Ceph, Ceilometer and Heat rebased for 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: 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: true
-       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,opendaylight
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  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_heat_ceilometer_scenario_0.0.4.yaml b/deploy/scenario/no-ha_onos_heat_ceilometer_scenario.yaml
index f8c705ff6..f8c705ff6 100644
--- a/deploy/scenario/no-ha_onos_heat_ceilometer_scenario_0.0.4.yaml
+++ b/deploy/scenario/no-ha_onos_heat_ceilometer_scenario.yaml
diff --git a/deploy/scenario/no-ha_onos_heat_ceilometer_scenario_0.0.1.yaml b/deploy/scenario/no-ha_onos_heat_ceilometer_scenario_0.0.1.yaml
deleted file mode 100644
index e30c1dfe9..000000000
--- a/deploy/scenario/no-ha_onos_heat_ceilometer_scenario_0.0.1.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 No-HA deployment
-   version: 0.0.1
-   created: Jan 7 2016
-   comment: ONOS No HA with Ceph, Ceilometer and Heat
-
-##############################################################################
-# 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.1
-     module-config-override:
-       # Module config overrides
-       public_eth:
-         value: 'eth3'
-
-##############################################################################
-# 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
-  wanted_release: Kilo on Ubuntu 14.04
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller,onos
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_1
-  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_onos_heat_ceilometer_scenario_0.0.2.yaml b/deploy/scenario/no-ha_onos_heat_ceilometer_scenario_0.0.2.yaml
deleted file mode 100644
index 605b46e58..000000000
--- a/deploy/scenario/no-ha_onos_heat_ceilometer_scenario_0.0.2.yaml
+++ /dev/null
@@ -1,150 +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.2
-   created: Jan 10 2016
-   comment: ONOS No HA with Ceph, Ceilometer and Heat
-
-##############################################################################
-# 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.1
-     module-config-override:
-       # Module config overrides
-       public_eth:
-         value: 'eth3'
-
-##############################################################################
-# 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
-    name: onos_no-ha
-
-  wanted_release: Kilo on Ubuntu 14.04
-  nodes:
-  - id: 1
-    interfaces: interfaces_1
-    role: mongo,controller,onos
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_2
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_2
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_2
-
-# Unique network transformation for ONOS deployment
-  transformations_2:
-    transformations:
-    - action: add-br
-      name: br-fw-admin
-    - action: add-br
-      name: br-mgmt
-    - action: add-br
-      name: br-storage
-    - action: add-br
-      name: br-mesh
-    - action: add-port
-      bridge: br-fw-admin
-      name: eth0
-    - action: add-port
-      bridge: br-mgmt
-      name: eth0.101
-    - action: add-port
-      bridge: br-storage
-      name: eth1.102
-    - action: add-port
-      bridge: br-mesh
-      name: eth2.103
-
-  settings:
-    editable:
-      common:
-        libvirt_type:
-          # ONOS requires QEMU
-          value: qemu
-      public_network_assignment:
-        assign_to_all_nodes:
-          # ONOS should not have public network assignment to all nodes
-          value: false
-      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_onos_heat_ceilometer_scenario_0.0.3.yaml b/deploy/scenario/no-ha_onos_heat_ceilometer_scenario_0.0.3.yaml
deleted file mode 100644
index c7eea4e59..000000000
--- a/deploy/scenario/no-ha_onos_heat_ceilometer_scenario_0.0.3.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: ONOS No-HA deployment
-   version: 0.0.3
-   created: Jan 29 2016
-   comment: ONOS No HA with Ceph, Ceilometer and Heat - Rebased for 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: onos
-     module-config-name: fuel-onos
-     module-config-version: 0.0.2
-     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
-    transformations: transformations_1
-  - id: 2
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_2
-  - id: 3
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_2
-  - id: 4
-    interfaces: interfaces_1
-    role: ceph-osd,compute
-    transformations: transformations_2
-  settings:
-    editable:
-      common:
-        libvirt_type:
-          # ONOS requires QEMU
-          value: qemu
-      public_network_assignment:
-        assign_to_all_nodes:
-          # ONOS should not have public network assignment to all nodes
-          value: false
-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_0.0.1.yaml b/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml
index 9e9aa0821..5df530f42 100644
--- a/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario_0.0.1.yaml
+++ b/deploy/scenario/no-ha_vlan_heat_ceilometer_scenario.yaml
@@ -41,7 +41,6 @@ dea-override-config:
     mode: ha
     net_segment_type: vlan
     name: opnfv-vlan-noha
-  wanted_release: Kilo on Ubuntu 14.04
   nodes:
   - id: 1
     interfaces: interfaces_1
diff --git a/deploy/scenario/scenario.yaml b/deploy/scenario/scenario.yaml
index a809f04cf..5770cdeaf 100644
--- a/deploy/scenario/scenario.yaml
+++ b/deploy/scenario/scenario.yaml
@@ -29,49 +29,49 @@
 ##############################################################################
 
 os-nosdn-nofeature-ha:
-  configfile: ha_heat_ceilometer_scenario_0.0.3.yaml
+  configfile: ha_heat_ceilometer_scenario.yaml
 
 os-nosdn-nofeature-noha:
-  configfile: no-ha_heat_ceilometer_scenario_0.0.2.yaml
+  configfile: no-ha_heat_ceilometer_scenario.yaml
 
 os-odl_l3-nofeature-ha:
-  configfile: ha_odl-l3_heat_ceilometer_scenario_0.0.4.yaml
+  configfile: ha_odl-l3_heat_ceilometer_scenario.yaml
 
 os-odl_l3-nofeature-noha:
-  configfile: no-ha_odl-l3_heat_ceilometer_scenario_0.0.3.yaml
+  configfile: no-ha_odl-l3_heat_ceilometer_scenario.yaml
 
 os-odl_l2-nofeature-ha:
-  configfile: ha_odl-l2_heat_ceilometer_scenario_0.0.3.yaml
+  configfile: ha_odl-l2_heat_ceilometer_scenario.yaml
 
 os-odl_l2-nofeature-noha:
-  configfile: no-ha_odl-l2_heat_ceilometer_scenario_0.0.2.yaml
+  configfile: no-ha_odl-l2_heat_ceilometer_scenario.yaml
 
 os-onos-nofeature-ha:
-  configfile: ha_onos_heat_ceilometer_scenario_0.0.5.yaml
+  configfile: ha_onos_heat_ceilometer_scenario.yaml
 
 os-onos-nofeature-noha:
-  configfile: no-ha_onos_heat_ceilometer_scenario_0.0.4.yaml
+  configfile: no-ha_onos_heat_ceilometer_scenario.yaml
 
 os-nosdn-kvm-ha:
-  configfile: ha_nfv-kvm_heat_ceilometer_scenario_0.0.5.yaml
+  configfile: ha_nfv-kvm_heat_ceilometer_scenario.yaml
 
 os-nosdn-kvm-noha:
-  configfile: no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.4.yaml
+  configfile: no-ha_nfv-kvm_heat_ceilometer_scenario.yaml
 
 os-nosdn-ovs-ha:
-  configfile: ha_nfv-ovs_heat_ceilometer_scenario_0.0.5.yaml
+  configfile: ha_nfv-ovs_heat_ceilometer_scenario.yaml
 
 os-nosdn-ovs-noha:
-  configfile: no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.4.yaml
+  configfile: no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
 
 os-odl_l2-bgpvpn-ha:
-  configfile: ha_odl-bgpvpn_scenario_0.0.1.yaml
+  configfile: ha_odl-bgpvpn_scenario.yaml
 
 os-odl_l2-bgpvpn-noha:
-  configfile: no-ha_odl-bgpvpn_scenario_0.0.1.yaml
+  configfile: no-ha_odl-bgpvpn_scenario.yaml
 
 os-odl_l2-sfc-ha:
-  configfile: ha_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml
+  configfile: ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
 
 os-odl_l2-sfc-noha:
-  configfile: no-ha_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml
+  configfile: no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml