summaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorNikolas Hermanns <nikolas.hermanns@ericsson.com>2016-03-07 13:50:54 +0100
committerJonas Bjurel <jonas.bjurel@ericsson.com>2016-04-06 15:12:33 +0000
commit516e64dda8b179c0988ec91b00771fa23b496dfb (patch)
treedaa713eb7399ea3f151f4b7fca881fb3feb00fa8 /deploy
parente7a78baae49f02b4303b6204eea7de01c527744c (diff)
Enable BGPVPN_extension/SDNVPN_feature
This commit includes the bugfixes and changes for BGPVPN_extensions and SDNVPN_feature of ODL. Change-Id: I9832680109edae497f7a344d5626568d3a335a15 (cherry picked from commit 2bebed7722fe1311cd1bc4199368db16dfad9a26)
Diffstat (limited to 'deploy')
-rw-r--r--deploy/config/plugins/fuel-odl_0.0.3.yaml117
-rw-r--r--deploy/scenario/no-ha_odl-bgpvpn_scenario_0.0.1.yaml85
2 files changed, 202 insertions, 0 deletions
diff --git a/deploy/config/plugins/fuel-odl_0.0.3.yaml b/deploy/config/plugins/fuel-odl_0.0.3.yaml
new file mode 100644
index 000000000..5c0078dbf
--- /dev/null
+++ b/deploy/config/plugins/fuel-odl_0.0.3.yaml
@@ -0,0 +1,117 @@
+##############################################################################
+# 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: OpenDaylight fuel Plugin configuration template
+ version: 0.3
+ created: 04.03.2016
+ comment: Added bgpvpn feature
+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
+ enable_bgpvpn:
+ weight: 13
+ type: "checkbox"
+ value: false
+ label: "BGPVPN extensions"
+ description:
+ >
+ This enables the bgpvpn extension of neutron togethere with the
+ corresponding sdnvpn features in odl. This feature will disable
+ the standart ovsdb feature from ODL.
+ restrictions:
+ - condition: "settings:bgpvpn == null or settings:bgpvpn.metadata.enabled == false"
+ strict: false
+ message: "BGPVPN (fuel-plugin-bgpvpn) plugin must be installed and enabled."
+ - networking_parameters:segmentation_type == 'vlan': This feature works only with segmentation_type != vlan
+ - condition: "settings:fuel-plugin-ovs == null or settings:fuel-plugin-ovs.metadata.enabled == false"
+ strict: false
+ message: "Openvswitch with NSH support (fuel-plugin-ovs) must be installed and enabled."
+ bgpvpn_gateway:
+ weight: 13
+ type: "text"
+ value: "0.0.0.0"
+ description: "Define the default gateway for BGPVPN"
+ label: "Default Gateway"
+ restrictions:
+ - settings:opendaylight.enable_bgpvpn.value == false: Only needed if BGPVPN is enabled.
+ regex:
+ source: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$
+ error: 'Invalid ip number'
+ metadata:
+ always_editable: false
+ restrictions:
+ - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight
+ odl_features:
+ default:
+ - config
+ - standard
+ - region
+ - package
+ - kar
+ - ssh
+ - management
+ odl-default:
+ - odl-restconf-all
+ - odl-aaa-authn
+ - odl-dlux-all
+ gbp:
+ - odl-groupbasedpolicy-neutronmapper
+ - odl-groupbasedpolicy-ofoverlay
+ ovs:
+ - odl-ovsdb-openstack
+ 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-openstack
+ # plugin_id: Assigned during installation
+ plugin_version: 0.8.1
+ rest_api_port:
+ value: '8282'
+ label: 'Port number'
+ description: 'Port on which ODL REST API will be available.'
+ weight: 40
+ type: "text"
+ regex:
+ 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])$
+ error: 'Invalid port number'
+ weight: 70
diff --git a/deploy/scenario/no-ha_odl-bgpvpn_scenario_0.0.1.yaml b/deploy/scenario/no-ha_odl-bgpvpn_scenario_0.0.1.yaml
new file mode 100644
index 000000000..067da4761
--- /dev/null
+++ b/deploy/scenario/no-ha_odl-bgpvpn_scenario_0.0.1.yaml
@@ -0,0 +1,85 @@
+##############################################################################
+# 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 No-HA BGPVPN deployment
+ version: 0.0.1
+ created: 04.03.2016
+ comment: Fuel ODL 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:
+ - 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:
+
+ 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
+
+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: