summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2016-02-18 10:11:11 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-02-18 10:11:11 +0000
commit857d1204ba768cd949f85511e66c697a630e2be4 (patch)
tree1f78380cbd0a8482f1e62591d773b440d347cc75
parent5ceaa64c1e81b89dfcce28797741fa2afd017eae (diff)
parentfd28ff15dcf266c93c230b84d5b0eac152320c7c (diff)
Merge "Scenario for SFC"
-rw-r--r--deploy/config/plugins/fuel-nshovs_0.0.1.yaml44
-rw-r--r--deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml188
-rw-r--r--deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml166
-rw-r--r--deploy/scenario/scenario.yaml11
4 files changed, 404 insertions, 5 deletions
diff --git a/deploy/config/plugins/fuel-nshovs_0.0.1.yaml b/deploy/config/plugins/fuel-nshovs_0.0.1.yaml
new file mode 100644
index 000000000..ec3ac38a9
--- /dev/null
+++ b/deploy/config/plugins/fuel-nshovs_0.0.1.yaml
@@ -0,0 +1,44 @@
+##############################################################################
+# 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
+##############################################################################
+
+plugin-config-metadata:
+ title: NSHOVS fuel Plugin configuration template
+ version: 0.1
+ created: Wed Feb 17 2016
+ comment: None
+
+fuel-plugin-ovs:
+ metadata:
+ #chosen_id: Choosen at install time
+ class: plugin
+ default: false
+ enabled: true
+ label: Openvswitch with NSH support
+ toggleable: true
+ versions:
+ - dpdk-bind-nic:
+ label: Network device
+ type: text
+ value: eth2
+ weight: 40
+ metadata:
+ always_editable: false
+ #plugin_id: Choosen at install time
+ plugin_version: 0.5.2
+ use_dpdk:
+ label: Use dpdk
+ type: checkbox
+ value: false
+ weight: 20
+ use_dppd:
+ label: Use dppd
+ type: checkbox
+ value: false
+ weight: 20
+ weight: 70
diff --git a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml
new file mode 100644
index 000000000..70b91e71e
--- /dev/null
+++ b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml
@@ -0,0 +1,188 @@
+##############################################################################
+# 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 SFC HA deployment
+ version: 0.0.1
+ created: Feb 10 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: nsh-ovs
+ module-config-name: fuel-nshovs
+ module-config-version: 0.0.1
+ module-config-override:
+# Note that the module substitionion does not support arrays
+# This is a quick fix
+# - module: opendaylight
+# module-config-name: fuel-odl
+# module-config-version: 0.0.2
+# module-config-override:
+ # Module config overrides
+# rest_api_port:
+# value: '8282'
+# enable_gbp:
+# value: false
+# enable_l3_odl:
+# value: false
+# enable_sfc:
+# value: false
+
+##############################################################################
+# By editing the override-config sections below, you can override arbitrary
+# configuration name-space settings
+dea-override-config:
+ nodes:
+ - id: 1
+ interfaces: interfaces_1
+ role: controller,opendaylight
+ 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: true
+ 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: true
+ weight: 13
+ metadata:
+ always_editable: false
+ odl_features:
+ default:
+ - config
+ - standard
+ - region
+ - package
+ - kar
+ - ssh
+ - management
+ - odl-restconf-all
+ gbp:
+ - odl-groupbasedpolicy-neutronmapper
+ - odl-groupbasedpolicy-ofoverlay
+ ovs:
+ - odl-ovsdb-openstack
+ - odl-restconf-all
+ - odl-aaa-authn
+ - odl-dlux-all
+ sfc:
+ - odl-sfc-model
+ - odl-sfc-provider
+ - odl-sfc-provider-rest.
+ - odl-sfc-sb-rest
+ - odl-sfc-ui
+ - odl-sfc-netconf
+ - odl-sfc-ovs
+ - odl-sfcofl2
+ 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/no-ha_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml
new file mode 100644
index 000000000..028aa15dd
--- /dev/null
+++ b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml
@@ -0,0 +1,166 @@
+##############################################################################
+# 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-SFC No-HA deployment
+ version: 0.0.1
+ created: Feb 10 2016
+ comment: Fuel ODL-L2 SFC 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: nsh-ovs
+ module-config-name: fuel-nshovs
+ module-config-version: 0.0.1
+ module-config-override:
+
+# Note that the module substitionion does not support arrays
+# This is a quick fix
+# - module: opendaylight
+# module-config-name: fuel-odl
+# module-config-version: 0.0.2
+# module-config-override:
+# # Module config overrides
+# rest_api_port:
+# value: '8282'
+# enable_gbp:
+# value: false
+# enable_l3_odl:
+# value: false
+# enable_sfc:
+# value: false
+
+##############################################################################
+# By editing the override-config sections below, you can override arbitrary
+# configuration name-space settings
+dea-override-config:
+
+ nodes:
+ - id: 1
+ interfaces: interfaces_1
+ role: mongo,controller,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: true
+ 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: true
+ weight: 13
+ metadata:
+ always_editable: false
+ odl_features:
+ default:
+ - config
+ - standard
+ - region
+ - package
+ - kar
+ - ssh
+ - management
+ - odl-restconf-all
+ gbp:
+ - odl-groupbasedpolicy-neutronmapper
+ - odl-groupbasedpolicy-ofoverlay
+ ovs:
+ - odl-ovsdb-openstack
+ - odl-restconf-all
+ - odl-aaa-authn
+ - odl-dlux-all
+ sfc:
+ - odl-sfc-model
+ - odl-sfc-provider
+ - odl-sfc-provider-rest.
+ - odl-sfc-sb-rest
+ - odl-sfc-ui
+ - odl-sfc-netconf
+ - odl-sfc-ovs
+ - odl-sfcofl2
+ 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 74a69fd66..f7d06510c 100644
--- a/deploy/scenario/scenario.yaml
+++ b/deploy/scenario/scenario.yaml
@@ -34,10 +34,6 @@ os-nosdn-nofeature-ha:
os-nosdn-nofeature-noha:
configfile: no-ha_heat_ceilometer_scenario_0.0.2.yaml
-os-nosdn-vlan-ha:
-
-os-nosdn-vlan-noha:
-
os-odl_l3-nofeature-ha:
configfile: ha_odl-l3_heat_ceilometer_scenario_0.0.4.yaml
@@ -68,9 +64,14 @@ os-nosdn-ovs-ha:
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
os-odl_l2-bgpvpn-noha:
configfile: no-ha_odl-l2_bgpvpn_scenario_0.0.2.yaml
+
+os-odl_l2-sfc-ha:
+ configfile: ha_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml
+
+os-odl_l2-sfc-noha:
+ configfile: no-ha_odl-l2_sfc_heat_ceilometer_scenario_0.0.1.yaml