From: Michal Skalski Date: Wed, 7 Dec 2016 00:36:41 +0000 (+0100) Subject: Uplift OpenDaylight plugin to Fuel 10 X-Git-Tag: danube.1.RC1~50 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F65%2F25565%2F6;p=fuel.git Uplift OpenDaylight plugin to Fuel 10 Currently only update pure odl scenarios because both sfc and bgpvpn variants require additional plugins. JIRA: FUEL-224 JIRA: FUEL-222 Change-Id: I9891029d3f6a4b6b124cca13caceaab6edb6ca6a Signed-off-by: Michal Skalski --- diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile index c21546ad3..890cfaf5a 100644 --- a/build/f_isoroot/Makefile +++ b/build/f_isoroot/Makefile @@ -11,9 +11,9 @@ # Add Fuel plugin build targets here # Plugins disabled for the Fuel Newton uplift. Please re-enable your plugin as you have # verified it! -PLUGINS ?= f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild f_yardstick-pluginbuild f_collectd-ceilometer-pluginbuild f_congress-pluginbuild +PLUGINS ?= f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild f_yardstick-pluginbuild f_collectd-ceilometer-pluginbuild f_congress-pluginbuild f_odlpluginbuild export PLUGINS -NON_10-0_REBASED_PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_bgpvpn-pluginbuild +NON_10-0_REBASED_PLUGINS = f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_bgpvpn-pluginbuild # If the BUILD_FUEL_PLUGINS environment variable is set, only build the plugins # indicated therein. diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile index bf811f25f..d3a7ea81c 100644 --- a/build/f_isoroot/f_odlpluginbuild/Makefile +++ b/build/f_isoroot/f_odlpluginbuild/Makefile @@ -28,6 +28,7 @@ release:.odlbuild cp gitinfo_odlplugin.txt $(BUILD_BASE) .odlbuild: rm -rf fuel-plugin-opendaylight + ../../docker/ubuntu-builder/install_docker.sh git clone -b $(FUEL_PLUGIN_ODL_BRANCH) $(FUEL_PLUGIN_ODL_REPO) cd fuel-plugin-opendaylight; \ if [ -n $(FUEL_PLUGIN_ODL_CHANGE) ]; then \ diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk index 55facfe4f..2db9f55ef 100644 --- a/build/f_isoroot/f_odlpluginbuild/config.mk +++ b/build/f_isoroot/f_odlpluginbuild/config.mk @@ -8,8 +8,8 @@ ############################################################################## FUEL_PLUGIN_ODL_BRANCH ?= master -FUEL_PLUGIN_ODL_CHANGE ?= 7281b0db9171e5aeda0c23ba655f086a909395a1 +FUEL_PLUGIN_ODL_CHANGE ?= 207f8627279cfd4aa2192c2d7ce39f3b00633bf5 FUEL_PLUGIN_ODL_REPO ?= https://github.com/openstack/fuel-plugin-opendaylight.git -export ODL_TARBALL_LOCATION?=https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.5.0-Boron/distribution-karaf-0.5.0-Boron.tar.gz -export ODL_VERSION_NUMBER?=0.5.0 +export OPNFV_BUILD?=true +export ODL_VERSIONS?=5.0.0.1 5.2.0.1 diff --git a/deploy/config/plugins/fuel-odl_0.0.1.yaml b/deploy/config/plugins/fuel-odl_0.0.1.yaml deleted file mode 100644 index 53c510557..000000000 --- a/deploy/config/plugins/fuel-odl_0.0.1.yaml +++ /dev/null @@ -1,91 +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 -############################################################################## - -plugin-config-metadata: - title: OpenDaylight fuel Plugin configuration template - version: 0.1 - created: Mon Dec 28 2015 - comment: None - -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 - # 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 diff --git a/deploy/config/plugins/fuel-odl_0.0.2.yaml b/deploy/config/plugins/fuel-odl_0.0.2.yaml deleted file mode 100644 index bd2ef5bb2..000000000 --- a/deploy/config/plugins/fuel-odl_0.0.2.yaml +++ /dev/null @@ -1,91 +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 -############################################################################## - -plugin-config-metadata: - title: OpenDaylight fuel Plugin configuration template - version: 0.2 - created: Tue Jan 26 2016 - comment: Rebased to Fuel8 and BE ODL plugin -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 diff --git a/deploy/config/plugins/fuel-odl_0.0.3.yaml b/deploy/config/plugins/fuel-odl_0.0.3.yaml deleted file mode 100644 index 5c0078dbf..000000000 --- a/deploy/config/plugins/fuel-odl_0.0.3.yaml +++ /dev/null @@ -1,117 +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 -############################################################################## - -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/config/plugins/fuel-odl_1.0.0.yaml b/deploy/config/plugins/fuel-odl_1.0.0.yaml new file mode 100644 index 000000000..c223130f3 --- /dev/null +++ b/deploy/config/plugins/fuel-odl_1.0.0.yaml @@ -0,0 +1,151 @@ +############################################################################## +# Copyright (c) 2015,2016 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.5 + created: 07.12.2016 + comment: Fuel 10 support +opendaylight: + metadata: + #chosen_id: Assigned during installation + class: plugin + default: false + enabled: true + label: OpenDaylight plugin + toggleable: true + versions: + - enable_l3_odl: + weight: 10 + type: "checkbox" + value: false + 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 + enable_sfc: + weight: 20 + type: "checkbox" + value: false + label: "SFC features" + sfc_class: + weight: 21 + type: "select" + value: "ncr" + label: "Classifier used by SFC" + values: + - data: "ncr" + label: "NetVirt" + - data: "gcr" + label: "GBP" + description: + > + Classifier determines what traffic needs to be chained based on policy based on yang model. + The OpenDayLight actually supports the OVSDB NetVirt and the GBP classifier in case of SFC. + restrictions: + - condition: "settings:opendaylight.enable_sfc.value == false" + action: "hide" + enable_bgpvpn: + weight: 40 + type: "checkbox" + value: false + label: "BGPVPN extensions" + description: + > + This enables the bgpvpn extension of neutron together with the + corresponding sdnvpn features in odl. This feature will disable + the standard 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:opendaylight.enable_l3_odl.value == false" + strict: false + message: "OpenDaylight must be acting as the L3 controller for the bgpvpn features to be enabled." + - condition: "settings:opendaylight.deb_version.value != '5.2.0-1'" + strict: false + message: "The BGPVPN features only support OpenDaylight 5.2.0-1. The OpenDaylight package version field must be set to that value." + odl_v2: + weight: 60 + type: "checkbox" + value: false + label: "Use V2 ML2 driver" + description: "V2 version is considered as experimental" + rest_api_port: + value: '8282' + label: 'Port number' + description: 'Port on which ODL REST API will be available.' + weight: 70 + 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' + java_min_mem: + value: '1g' + label: 'Java -Xms option' + description: 'Initial memory allocation pool.' + weight: 80 + type: "text" + java_max_mem: + value: '2g' + label: 'Java -Xmx option' + description: 'Maximum memory allocation pool.' + weight: 81 + type: "text" + java_extra_opts: + value: '-XX:+UseG1GC' + label: 'Java extra options' + description: 'Additional options.' + weight: 82 + type: "text" + deb_version: + value: '5.0.0-1' + label: 'OpenDaylight package version' + description: 'Plugin can be build with more than one version of ODL.' + weight: 90 + type: "text" + metadata: + 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 + gcr: + - odl-groupbasedpolicy-ovssfc + ncr: + - odl-ovsdb-sfc + - odl-ovsdb-sfc-rest + ovsdb: + - odl-ovsdb-openstack + netvirt: + - odl-netvirt-openstack + sfc: + - odl-sfc-model + - odl-sfc-provider + - odl-sfc-provider-rest + - odl-sfc-ovs + - odl-sfc-openflow-renderer + default_credentials: + user: admin + password: admin + jetty_port: 8181 + #plugin_id: Assigned during installation + plugin_version: 1.0.0 + weight: 70 diff --git a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml index 90c89aedc..356abb07e 100644 --- a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml @@ -22,9 +22,9 @@ # deployment configuration meta-data deployment-scenario-metadata: title: ODL-L2 HA deployment - version: 0.0.4 - created: Jun 02 2016 - comment: Rebased to Fuel9 + version: 0.0.5 + created: Dec 07 2016 + comment: Rebased to Fuel10 ############################################################################## # Stack extentions are opnfv added value features in form of a fuel-plugin @@ -34,7 +34,7 @@ deployment-scenario-metadata: stack-extensions: - module: opendaylight module-config-name: fuel-odl - module-config-version: 0.9.0 + module-config-version: 1.0.0 module-config-override: # Note that the module substitionion does not support arrays # This is a quick fix diff --git a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml index 967e7d295..43eb9029b 100644 --- a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml @@ -22,9 +22,9 @@ # deployment configuration meta-data deployment-scenario-metadata: title: ODL-L3 HA deployment - version: 0.0.5 - created: Jun 02 2016 - comment: Rebased to Fuel9 + version: 0.0.6 + created: Dec 07 2016 + comment: Rebased to Fuel10 ############################################################################## # Stack extentions are opnfv added value features in form of a fuel-plugin @@ -36,32 +36,14 @@ deployment-scenario-metadata: stack-extensions: - module: opendaylight module-config-name: fuel-odl - module-config-version: 0.9.0 + module-config-version: 1.0.0 module-config-override: metadata: versions: - enable_l3_odl: value: true metadata: - plugin_version: 0.9.0 - - - module: fuel-plugin-ovs - module-config-name: fuel-nshovs - module-config-version: 0.9.0 - -# - 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 + plugin_version: 1.0.0 ############################################################################## # By editing the override-config sections below, you can override arbitrary diff --git a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml index f8787d780..903aa57fb 100644 --- a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml @@ -22,9 +22,9 @@ # deployment configuration meta-data deployment-scenario-metadata: title: ODL-L2 No-HA deployment - version: 0.0.3 - created: Jun 02 2016 - comment: Rebased to Fuel9 + version: 0.0.4 + created: Dec 07 2016 + comment: Rebased to Fuel10 ############################################################################## # Stack extentions are opnfv added value features in form of a fuel-plugin @@ -34,7 +34,7 @@ deployment-scenario-metadata: stack-extensions: - module: opendaylight module-config-name: fuel-odl - module-config-version: 0.9.0 + module-config-version: 1.0.0 module-config-override: # Note that the module substitionion does not support arrays # This is a quick fix diff --git a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml index 0c8415f78..3353d6744 100644 --- a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml @@ -22,9 +22,9 @@ # deployment configuration meta-data deployment-scenario-metadata: title: ODL-L3 No-HA deployment - version: 0.0.4 - created: Jun 02 2016 - comment: Rebased to Fuel9 + version: 0.0.5 + created: Dec 07 2016 + comment: Rebased to Fuel10 ############################################################################## # Stack extentions are opnfv added value features in form of a fuel-plugin @@ -36,32 +36,14 @@ deployment-scenario-metadata: stack-extensions: - module: opendaylight module-config-name: fuel-odl - module-config-version: 0.9.0 + module-config-version: 1.0.0 module-config-override: metadata: versions: - enable_l3_odl: value: true metadata: - plugin_version: 0.9.0 - - - module: fuel-plugin-ovs - module-config-name: fuel-nshovs - module-config-version: 0.9.0 - -# - 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 + plugin_version: 1.0.0 ############################################################################## # By editing the override-config sections below, you can override arbitrary