aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2016-04-08 09:56:03 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-04-08 09:56:03 +0000
commit5e341a6f501e408dfd4c0dce401a6587ec6d5277 (patch)
treee4160989740156535f5990d0f9d6aaac243f3de4
parent080b202e25964768f58825950bc779fe7d39002f (diff)
parent76ff59b268ee4a6dadbca93a872c753e5e583b3b (diff)
Merge "Cleanup and add bgpvpn to scenario file" into stable/brahmaputra
-rw-r--r--deploy/scenario/ha_odl-bgpvpn_scenario_0.0.1.yaml (renamed from deploy/scenario/ha_odl-l2_bgpvpn_scenario_0.0.1.yaml)83
-rw-r--r--deploy/scenario/ha_odl-l2_bgpvpn_scenario_0.0.2.yaml239
-rw-r--r--deploy/scenario/no-ha_odl-l2_bgpvpn_scenario_0.0.1.yaml126
-rw-r--r--deploy/scenario/no-ha_odl-l2_bgpvpn_scenario_0.0.2.yaml176
-rw-r--r--deploy/scenario/scenario.yaml4
5 files changed, 23 insertions, 605 deletions
diff --git a/deploy/scenario/ha_odl-l2_bgpvpn_scenario_0.0.1.yaml b/deploy/scenario/ha_odl-bgpvpn_scenario_0.0.1.yaml
index 3890286e4..c0343a617 100644
--- a/deploy/scenario/ha_odl-l2_bgpvpn_scenario_0.0.1.yaml
+++ b/deploy/scenario/ha_odl-bgpvpn_scenario_0.0.1.yaml
@@ -21,10 +21,10 @@
##############################################################################
# deployment configuration meta-data
deployment-scenario-metadata:
- title: ODL-L2 HA BGPVPN deployment
+ title: ODL HA BGPVPN deployment
version: 0.0.1
- created: Jan 19 2016
- comment: Fuel ODL-L2 HA with Ceph, Ceilometer, Heat and BGPVPN
+ created: 04.03.2016
+ comment: Fuel ODL HA with BGPVPN, Ceph, Ceilometer and Heat Rebased for Fuel8
##############################################################################
# Stack extentions are opnfv added value features in form of a fuel-plugin
@@ -32,33 +32,29 @@ deployment-scenario-metadata:
# <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:
+ - module: opendaylight
+ module-config-name: fuel-odl
+ module-config-version: 0.0.3
+ module-config-override:
+ metadata:
+ versions:
+ - enable_bgpvpn:
+ value: true
+ metadata:
+ plugin_version: 0.8.1
+ - module: bgpvpn
+ module-config-name: fuel-bgpvpn
+ module-config-version: 0.0.3
+
+ - module: fuel-plugin-ovs
+ module-config-name: fuel-nshovs
+ module-config-version: 0.0.1
##############################################################################
# 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
@@ -80,44 +76,7 @@ dea-override-config:
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:
diff --git a/deploy/scenario/ha_odl-l2_bgpvpn_scenario_0.0.2.yaml b/deploy/scenario/ha_odl-l2_bgpvpn_scenario_0.0.2.yaml
deleted file mode 100644
index 0453b1f11..000000000
--- a/deploy/scenario/ha_odl-l2_bgpvpn_scenario_0.0.2.yaml
+++ /dev/null
@@ -1,239 +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 BGPVPN deployment
- version: 0.0.2
- created: 05.02.2016
- comment: Fuel ODL-L2 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:
-
- 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:
- bgpvpn:
- metadata:
- class: plugin
- default: false
- enabled: true
- label: BGPVPN plugin
- toggleable: true
- versions:
- - metadata:
- always_editable: false
- enabled: true
- label: BGPVPN plugin
- plugin_version: 0.8.0
- restrictions:
- - cluster:net_provider != 'neutron': Only neutron is supported by BGPVPN-plugin
- weight: 90
- weight: 70
- 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
- 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/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:
diff --git a/deploy/scenario/no-ha_odl-l2_bgpvpn_scenario_0.0.2.yaml b/deploy/scenario/no-ha_odl-l2_bgpvpn_scenario_0.0.2.yaml
deleted file mode 100644
index 391bda321..000000000
--- a/deploy/scenario/no-ha_odl-l2_bgpvpn_scenario_0.0.2.yaml
+++ /dev/null
@@ -1,176 +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.2
- created: 05.02.2016
- comment: Fuel ODL-L2 No HA with BGPVPN, 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:
- bgpvpn:
- metadata:
- class: plugin
- default: false
- enabled: true
- label: BGPVPN plugin
- toggleable: true
- versions:
- - metadata:
- always_editable: false
- enabled: true
- label: BGPVPN plugin
- plugin_version: 0.8.0
- restrictions:
- - cluster:net_provider != 'neutron': Only neutron is supported by BGPVPN-plugin
- weight: 90
- weight: 70
- 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/scenario.yaml b/deploy/scenario/scenario.yaml
index 90f7b8367..9fac24a7f 100644
--- a/deploy/scenario/scenario.yaml
+++ b/deploy/scenario/scenario.yaml
@@ -65,10 +65,10 @@ os-nosdn-ovs-noha:
configfile: no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml
os-odl_l2-bgpvpn-ha:
- configfile: ha_odl-l2_bgpvpn_scenario_0.0.2.yaml
+ configfile: ha_odl-bgpvpn_scenario_0.0.1.yaml
os-odl_l2-bgpvpn-noha:
- configfile: no-ha_odl-l2_bgpvpn_scenario_0.0.2.yaml
+ configfile: no-ha_odl-bgpvpn_scenario_0.0.1.yaml
os-odl_l2-sfc-ha:
configfile: ha_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml