Rebasement of Fuel8 deployment configuration files and scenarios

Note:
- Lab configurations removed
- Most of the POD configuration files resides in the securedlab repo
- The securedlab repo is very restricive, cause it carries Lab internal
  secrets

TODO:
- Ericsson virt is not yet rebased
- Intel virt is not yet rebased
- LF-POD2 is not yet rebased
- Deployment scenarios for vsperf, NFVOVS, NFVKVM, ONOS, VSPERF, BGPVPN is not yet rebased

NOT VERIFIED
DO NOT MERGE

Change-Id: I59d96acb26c06abf60c254fae8ea2ced332e5884
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>

15 files changed, 1571 insertions, 27 deletions

diff --git a/deploy/scenario/ha_heat_ceilometer_scenario_0.0.3.yaml b/deploy/scenario/ha_heat_ceilometer_scenario_0.0.3.yaml
new file mode 100644
index 000000000..8ab5f9277
--- /dev/null
+++ b/deploy/scenario/ha_heat_ceilometer_scenario_0.0.3.yaml
@@ -0,0 +1,91 @@
+##############################################################################
+# Copyright (c) 2015 Ericsson AB and others.
+# jonas.bjurel@ericsson.com
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+############################################################################### # Description:
+# This .yaml configuration file defines the configuration of the fuel
+# deployment and is passed as an argument to deploy.sh
+# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
+# This will make build.sh fetch this configuration file and configure the
+# deployment accordingly.
+# After the deployment, a copy of this file gets uploaded to fuel:
+# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
+# /root/deploy-config.sha1
+##############################################################################
+
+##############################################################################
+# deployment configuration meta-data
+deployment-scenario-metadata:
+   title: OpenStack-only, HA deployment
+   version: 0.0.3
+   created: Jan 26 2016
+   comment: Rebased to Fuel8
+
+##############################################################################
+# Stack extentions are opnfv added value features in form of a fuel-plugin
+# plug-ins listed below will be enabled and configured according to the
+# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
+# It does so by copying the config file to the local plugin config directory
+stack-extensions:
+
+##############################################################################
+# 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
+    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-kvm_heat_ceilometer_scenario_0.0.3.yaml b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario_0.0.3.yaml
new file mode 100644
index 000000000..b653cad5c
--- /dev/null
+++ b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario_0.0.3.yaml
@@ -0,0 +1,97 @@
+##############################################################################
+# 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-ovs_heat_ceilometer_scenario_0.0.3.yaml b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml
new file mode 100644
index 000000000..22cd91df9
--- /dev/null
+++ b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml
@@ -0,0 +1,96 @@
+##############################################################################
+# 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_odl-l2_heat_ceilometer_scenario_0.0.3.yaml b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario_0.0.3.yaml
new file mode 100644
index 000000000..14316df2d
--- /dev/null
+++ b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario_0.0.3.yaml
@@ -0,0 +1,182 @@
+##############################################################################
+# 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.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:
+# Note that the module substitionion does not support arrays
+# This is a quick fix
+#   - module: opendaylight
+#     module-config-name: fuel-odl
+#     module-config-version: 0.0.2
+#     module-config-override:
+       # Module config overrides
+#       rest_api_port:
+#         value: '8282'
+#       enable_gbp:
+#         value: false
+#       enable_l3_odl:
+#         value: false
+#       enable_sfc:
+#         value: false
+
+##############################################################################
+# By editing the override-config sections below, you can override arbitrary
+# configuration name-space settings
+dea-override-config:
+  nodes:
+  - id: 1
+    interfaces: interfaces_1
+    role: controller,opendaylight
+    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:
+      opendaylight:
+        metadata:
+          # chosen_id: Assigned during installation
+          class: plugin
+          default: false
+          enabled: true
+          label: OpenDaylight plugin
+          toggleable: true
+          versions:
+          - enable_gbp:
+              label: GBP features
+              type: checkbox
+              value: false
+              weight: 14
+            enable_l3_odl:
+              label: Use ODL to manage L3 traffic
+              restrictions:
+              - networking_parameters:segmentation_type == 'vlan': Use tunneling segmentation type.
+              - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign public network to all nodes
+              type: checkbox
+              value: false
+              weight: 12
+            enable_sfc:
+              label: SFC features
+              type: checkbox
+              value: false
+              weight: 13
+            metadata:
+              always_editable: false
+              odl_features:
+                default:
+                - config
+                - standard
+                - region
+                - package
+                - kar
+                - ssh
+                - management
+                gbp:
+                - odl-groupbasedpolicy-base
+                - odl-groupbasedpolicy-ofoverlay
+                ovs:
+                - odl-ovsdb-openstack
+                - odl-restconf-all
+                - odl-aaa-authn
+                - odl-dlux-all
+                sfc:
+                - odl-sfc-core
+                - odl-sfc-sb-rest
+                - odl-sfc-ui
+                - odl-sfc-netconf
+                - odl-sfc-ovs
+                - odl-sfcofl2
+                - odl-sfc-test-consumer
+                vpn:
+                - odl-vpnservice-api
+                - odl-vpnservice-impl
+                - odl-vpnservice-impl-rest
+                - odl-vpnservice-impl-ui
+                - odl-vpnservice-core
+                - odl-vpnservice-openstack
+              # plugin_id: Assigned during installation
+              plugin_version: 0.8.0
+              restrictions:
+              - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight
+            rest_api_port:
+              description: Port on which ODL REST API will be available.
+              label: Port number
+              regex:
+                error: Invalid port number
+                source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$
+              type: text
+              value: '8282'
+              weight: 40
+          weight: 70
+
+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
new file mode 100644
index 000000000..96623309b
--- /dev/null
+++ b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario_0.0.3.yaml
@@ -0,0 +1,107 @@
+##############################################################################
+# 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_odl-l3_heat_ceilometer_scenario_0.0.4.yaml b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario_0.0.4.yaml
new file mode 100644
index 000000000..0f09ca478
--- /dev/null
+++ b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario_0.0.4.yaml
@@ -0,0 +1,185 @@
+##############################################################################
+# 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.4
+   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
+# Note that the module substitionion does not support arrays
+# This is a quick fix
+stack-extensions:
+#   - module: opendaylight
+#     module-config-name: fuel-odl
+#     module-config-version: 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
+      opendaylight:
+        metadata:
+          # chosen_id: Assigned during installation
+          class: plugin
+          default: false
+          enabled: true
+          label: OpenDaylight plugin
+          toggleable: true
+          versions:
+          - enable_gbp:
+              label: GBP features
+              type: checkbox
+              value: false
+              weight: 14
+            enable_l3_odl:
+              label: Use ODL to manage L3 traffic
+              restrictions:
+              - networking_parameters:segmentation_type == 'vlan': Use tunneling segmentation type.
+              - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign public network to all nodes
+              type: checkbox
+              value: true
+              weight: 12
+            enable_sfc:
+              label: SFC features
+              type: checkbox
+              value: false
+              weight: 13
+            metadata:
+              always_editable: false
+              odl_features:
+                default:
+                - config
+                - standard
+                - region
+                - package
+                - kar
+                - ssh
+                - management
+                gbp:
+                - odl-groupbasedpolicy-base
+                - odl-groupbasedpolicy-ofoverlay
+                ovs:
+                - odl-ovsdb-openstack
+                - odl-restconf-all
+                - odl-aaa-authn
+                - odl-dlux-all
+                sfc:
+                - odl-sfc-core
+                - odl-sfc-sb-rest
+                - odl-sfc-ui
+                - odl-sfc-netconf
+                - odl-sfc-ovs
+                - odl-sfcofl2
+                - odl-sfc-test-consumer
+                vpn:
+                - odl-vpnservice-api
+                - odl-vpnservice-impl
+                - odl-vpnservice-impl-rest
+                - odl-vpnservice-impl-ui
+                - odl-vpnservice-core
+                - odl-vpnservice-openstack
+              # plugin_id: Assigned during installation
+              plugin_version: 0.8.0
+              restrictions:
+              - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight
+            rest_api_port:
+              description: Port on which ODL REST API will be available.
+              label: Port number
+              regex:
+                error: Invalid port number
+                source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$
+              type: text
+              value: '8282'
+              weight: 40
+          weight: 70
+
+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
new file mode 100644
index 000000000..a115bb643
--- /dev/null
+++ b/deploy/scenario/ha_onos_heat_ceilometer_scenario_0.0.4.yaml
@@ -0,0 +1,105 @@
+##############################################################################
+# 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/no-ha_heat_ceilometer_scenario_0.0.2.yaml b/deploy/scenario/no-ha_heat_ceilometer_scenario_0.0.2.yaml
new file mode 100644
index 000000000..c21585979
--- /dev/null
+++ b/deploy/scenario/no-ha_heat_ceilometer_scenario_0.0.2.yaml
@@ -0,0 +1,66 @@
+##############################################################################
+# Copyright (c) 2015 Ericsson AB and others.
+# jonas.bjurel@ericsson.com
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+############################################################################### # Description:
+# This .yaml configuration file defines the configuration of the fuel
+# deployment and is passed as an argument to deploy.sh
+# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
+# This will make build.sh fetch this configuration file and configure the
+# deployment accordingly.
+# After the deployment, a copy of this file gets uploaded to fuel:
+# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
+# /root/deploy-config.sha1
+##############################################################################
+
+##############################################################################
+# deployment configuration meta-data
+deployment-scenario-metadata:
+   title: OpenStack-only, No-HA deployment
+   version: 0.0.2
+   created: Jan 26 2016
+   comment: Fuel OpenStack-only with Ceph, Ceilometer and Heat, No-HA deployment rebased with Fuel8
+
+##############################################################################
+# Stack extentions are opnfv added value features in form of a fuel-plugin
+# plug-ins listed below will be enabled and configured according to the
+# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
+# It does so by copying the config file to the local plugin config directory
+stack-extensions:
+
+##############################################################################
+# 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
+    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.2.yaml b/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.2.yaml
new file mode 100644
index 000000000..74e20c2d6
--- /dev/null
+++ b/deploy/scenario/no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.2.yaml
@@ -0,0 +1,73 @@
+##############################################################################
+# 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-ovs_heat_ceilometer_scenario_0.0.2.yaml b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.2.yaml
new file mode 100644
index 000000000..18986a839
--- /dev/null
+++ b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.2.yaml
@@ -0,0 +1,72 @@
+##############################################################################
+# 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_odl-l2_heat_ceilometer_scenario_0.0.2.yaml b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario_0.0.2.yaml
new file mode 100644
index 000000000..0cc1258b7
--- /dev/null
+++ b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario_0.0.2.yaml
@@ -0,0 +1,159 @@
+##############################################################################
+# 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.2
+   created: Jan 26 2016
+   comment: Fuel ODL-L2 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:
+# Note that the module substitionion does not support arrays
+# This is a quick fix
+#   - module: opendaylight
+#     module-config-name: fuel-odl
+#     module-config-version: 0.0.2
+#     module-config-override:
+#       # Module config overrides
+#       rest_api_port:
+#         value: '8282'
+#       enable_gbp:
+#         value: false
+#       enable_l3_odl:
+#         value: false
+#       enable_sfc:
+#         value: false
+
+##############################################################################
+# By editing the override-config sections below, you can override arbitrary
+# configuration name-space settings
+dea-override-config:
+
+  nodes:
+  - id: 1
+    interfaces: interfaces_1
+    role: mongo,controller,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:
+      opendaylight:
+        metadata:
+          # chosen_id: Assigned during installation
+          class: plugin
+          default: false
+          enabled: true
+          label: OpenDaylight plugin
+          toggleable: true
+          versions:
+          - enable_gbp:
+              label: GBP features
+              type: checkbox
+              value: false
+              weight: 14
+            enable_l3_odl:
+              label: Use ODL to manage L3 traffic
+              restrictions:
+              - networking_parameters:segmentation_type == 'vlan': Use tunneling segmentation type.
+              - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign public network to all nodes
+              type: checkbox
+              value: false
+              weight: 12
+            enable_sfc:
+              label: SFC features
+              type: checkbox
+              value: false
+              weight: 13
+            metadata:
+              always_editable: false
+              odl_features:
+                default:
+                - config
+                - standard
+                - region
+                - package
+                - kar
+                - ssh
+                - management
+                gbp:
+                - odl-groupbasedpolicy-base
+                - odl-groupbasedpolicy-ofoverlay
+                ovs:
+                - odl-ovsdb-openstack
+                - odl-restconf-all
+                - odl-aaa-authn
+                - odl-dlux-all
+                sfc:
+                - odl-sfc-core
+                - odl-sfc-sb-rest
+                - odl-sfc-ui
+                - odl-sfc-netconf
+                - odl-sfc-ovs
+                - odl-sfcofl2
+                - odl-sfc-test-consumer
+                vpn:
+                - odl-vpnservice-api
+                - odl-vpnservice-impl
+                - odl-vpnservice-impl-rest
+                - odl-vpnservice-impl-ui
+                - odl-vpnservice-core
+                - odl-vpnservice-openstack
+              # plugin_id: Assigned during installation
+              plugin_version: 0.8.0
+              restrictions:
+              - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight
+            rest_api_port:
+              description: Port on which ODL REST API will be available.
+              label: Port number
+              regex:
+                error: Invalid port number
+                source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$
+              type: text
+              value: '8282'
+              weight: 40
+          weight: 70
+
+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
new file mode 100644
index 000000000..414aacaf1
--- /dev/null
+++ b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario_0.0.2.yaml
@@ -0,0 +1,83 @@
+##############################################################################
+# 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_odl-l3_heat_ceilometer_scenario_0.0.3.yaml b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario_0.0.3.yaml
new file mode 100644
index 000000000..2ba2d6d75
--- /dev/null
+++ b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario_0.0.3.yaml
@@ -0,0 +1,161 @@
+##############################################################################
+# 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.3
+   created: Jan 28 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
+# Note that the module substitionion does not support arrays
+# This is a quick fix
+stack-extensions:
+#   - module: opendaylight
+#     module-config-name: fuel-odl
+#     module-config-version: 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
+      opendaylight:
+        metadata:
+          # chosen_id: Assigned during installation
+          class: plugin
+          default: false
+          enabled: true
+          label: OpenDaylight plugin
+          toggleable: true
+          versions:
+          - enable_gbp:
+              label: GBP features
+              type: checkbox
+              value: false
+              weight: 14
+            enable_l3_odl:
+              label: Use ODL to manage L3 traffic
+              restrictions:
+              - networking_parameters:segmentation_type == 'vlan': Use tunneling segmentation type.
+              - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign public network to all nodes
+              type: checkbox
+              value: true
+              weight: 12
+            enable_sfc:
+              label: SFC features
+              type: checkbox
+              value: false
+              weight: 13
+            metadata:
+              always_editable: false
+              odl_features:
+                default:
+                - config
+                - standard
+                - region
+                - package
+                - kar
+                - ssh
+                - management
+                gbp:
+                - odl-groupbasedpolicy-base
+                - odl-groupbasedpolicy-ofoverlay
+                ovs:
+                - odl-ovsdb-openstack
+                - odl-restconf-all
+                - odl-aaa-authn
+                - odl-dlux-all
+                sfc:
+                - odl-sfc-core
+                - odl-sfc-sb-rest
+                - odl-sfc-ui
+                - odl-sfc-netconf
+                - odl-sfc-ovs
+                - odl-sfcofl2
+                - odl-sfc-test-consumer
+                vpn:
+                - odl-vpnservice-api
+                - odl-vpnservice-impl
+                - odl-vpnservice-impl-rest
+                - odl-vpnservice-impl-ui
+                - odl-vpnservice-core
+                - odl-vpnservice-openstack
+              # plugin_id: Assigned during installation
+              plugin_version: 0.8.0
+              restrictions:
+              - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight
+            rest_api_port:
+              description: Port on which ODL REST API will be available.
+              label: Port number
+              regex:
+                error: Invalid port number
+                source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$
+              type: text
+              value: '8282'
+              weight: 40
+          weight: 70
+
+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
new file mode 100644
index 000000000..c7eea4e59
--- /dev/null
+++ b/deploy/scenario/no-ha_onos_heat_ceilometer_scenario_0.0.3.yaml
@@ -0,0 +1,82 @@
+##############################################################################
+# 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/scenario.yaml b/deploy/scenario/scenario.yaml
index 6090ef04a..0a13be576 100644
--- a/deploy/scenario/scenario.yaml
+++ b/deploy/scenario/scenario.yaml
@@ -29,61 +29,46 @@
 ##############################################################################
 
 os-nosdn-nofeature-ha:
-  configfile: ha_heat_ceilometer_scenario_0.0.2.yaml
+  configfile: ha_heat_ceilometer_scenario_0.0.3.yaml
 
 os-nosdn-nofeature-noha:
-  configfile: no-ha_heat_ceilometer_scenario_0.0.1.yaml
+  configfile: no-ha_heat_ceilometer_scenario_0.0.2.yaml
 
 os-nosdn-vlan-ha:
-  configfile: ha_vlan_heat_ceilometer_scenario_0.0.2.yaml
 
 os-nosdn-vlan-noha:
-  configfile: no-ha_vlan_heat_ceilometer_scenario_0.0.1.yaml
 
 os-odl_l3-nofeature-ha:
-  configfile: ha_odl-l3_heat_ceilometer_scenario_0.0.2.yaml
+  configfile: ha_odl-l3_heat_ceilometer_scenario_0.0.4.yaml
 
 os-odl_l3-nofeature-noha:
-  configfile: no-ha_odl-l3_heat_ceilometer_scenario_0.0.1.yaml
+  configfile: no-ha_odl-l3_heat_ceilometer_scenario_0.0.3.yaml
 
 os-odl_l2-nofeature-ha:
-  configfile: ha_odl-l2_heat_ceilometer_scenario_0.0.2.yaml
+  configfile: ha_odl-l2_heat_ceilometer_scenario_0.0.3.yaml
 
 os-odl_l2-nofeature-noha:
-  configfile: no-ha_odl-l2_heat_ceilometer_scenario_0.0.1.yaml
+  configfile: no-ha_odl-l2_heat_ceilometer_scenario_0.0.2.yaml
 
 os-onos-nofeature-ha:
-  configfile: ha_onos_heat_ceilometer_scenario_0.0.3.yaml
+  configfile: ha_onos_heat_ceilometer_scenario_0.0.4.yaml
 
 os-onos-nofeature-noha:
-  configfile: no-ha_onos_heat_ceilometer_scenario_0.0.1.yaml
-
-os-onos-nofeature-ha-virtual:
-  configfile: ha_onos_heat_ceilometer_scenario_0.0.2.yaml
-
-os-onos-nofeature-noha-virtual:
-  configfile: no-ha_onos_heat_ceilometer_scenario_0.0.2.yaml
+  configfile: no-ha_onos_heat_ceilometer_scenario_0.0.3.yaml
 
 os-nosdn-kvm-ha:
-  configfile: ha_nfv-kvm_heat_ceilometer_scenario_0.0.2.yaml
+  configfile: ha_nfv-kvm_heat_ceilometer_scenario_0.0.3.yaml
 
 os-nosdn-kvm-noha:
-  configfile: no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.1.yaml
+  configfile: no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.2.yaml
 
 os-nosdn-ovs-ha:
-  configfile: ha_nfv-ovs_heat_ceilometer_scenario_0.0.2.yaml
+  configfile: ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml
 
 os-nosdn-ovs-noha:
-  configfile: no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.1.yaml
-
-os-nosdn-kvm_ovs-ha:
-  configfile:
+  configfile: no-ha_nfv-ovseat_ceilometer_scenario_0.0.2.yaml
 
-os-nosdn-kvm_ovs-noha:
-  configfile: no-ha_nfv-kvm_nfv-ovs_heat_ceilometer_scenario_0.0.1.yaml
 
 os-odl_l2-bgpvpn-ha:
-  configfile: ha_odl-l2_bgpvpn_scenario_0.0.1.yaml
 
 os-odl_l2-bgpvpn-noha:
-  configfile: no-ha_odl-l2_bgpvpn_scenario_0.0.1.yaml