Cleanup and add bgpvpn to scenario file

Change-Id: I82ce16751b4d52d6fdb39883b730073164f9dfe0

1 files changed, 0 insertions, 126 deletions

diff --git a/deploy/scenario/no-ha_odl-l2_bgpvpn_scenario_0.0.1.yaml b/deploy/scenario/no-ha_odl-l2_bgpvpn_scenario_0.0.1.yaml
deleted file mode 100644
index 0eecc0bce..000000000
--- a/deploy/scenario/no-ha_odl-l2_bgpvpn_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 No-HA BGPVPN deployment
-   version: 0.0.1
-   created: Jan 14 2016
-   comment: Fuel ODL-L2 No HA with Ceph, Ceilometer, Heat and BGPVPN
-
-##############################################################################
-# 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
-   - module: bgpvpn
-     module-config-name: fuel-bgpvpn
-     module-config-version: 0.0.1
-     module-config-override:
-
-
-##############################################################################
-# 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: Liberty 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: