diff options
Diffstat (limited to 'networking-odl/devstack')
23 files changed, 113 insertions, 192 deletions
diff --git a/networking-odl/devstack/README.rst b/networking-odl/devstack/README.rst index 2b4bd1c..ba6f716 100644 --- a/networking-odl/devstack/README.rst +++ b/networking-odl/devstack/README.rst @@ -16,23 +16,20 @@ [[local|localrc]] enable_plugin networking-odl http://git.openstack.org/openstack/networking-odl -4. Optionally, to enable support for OpenDaylight L3 router functionality, - add the below. - Note: This is only relevant when using old netvirt (ovsdb based, default):: +4. Optionally, to enable support for OpenDaylight L3 router functionality, add the + below:: > cat local.conf [[local|localrc]] ODL_L3=True 5. If you need to route the traffic out of the box (e.g. br-ex), set - ODL_PROVIDER_MAPPINGS to map the physical provider network to device - mapping, as shown below:: + ODL_PROVIDER_MAPPINGS to map the interface, as shown below:: > cat local.conf [[local|localrc]] ODL_L3=True - ODL_PROVIDER_MAPPINGS=${ODL_PROVIDER_MAPPINGS:-br-ex:eth2} # for old netvirt (ovsdb based) - ODL_PROVIDER_MAPPINGS=${ODL_PROVIDER_MAPPINGS:-physnet1:eth2} # for new netvirt (vpnservice based) + ODL_PROVIDER_MAPPINGS=${ODL_PROVIDER_MAPPINGS:-br-ex:eth2} 6. Optionally, to enable support for OpenDaylight with LBaaS V2, add this:: @@ -44,8 +41,8 @@ 7. run ``stack.sh`` -8. Note: In a multi-node devstack environment, for each compute node you will - want to add this to the local.conf file:: +8. Note: In a multi-node devstack environment, for each compute node you will want to add this + to the local.conf file:: > cat local.conf [[local|localrc]] @@ -54,8 +51,8 @@ 9. Note: In a node using a release of Open vSwitch provided from another source than your Linux distribution you have to enable in your local.conf skipping - of OVS installation step by setting *SKIP_OVS_INSTALL=True*. For example - when stacking together with `networking-ovs-dpdk + of OVS installation step by setting *SKIP_OVS_INSTALL=True*. For example when + stacking together with `networking-ovs-dpdk <https://github.com/openstack/networking-ovs-dpdk/>`_ Neutron plug-in to avoid conflicts between openvswitch and ovs-dpdk you have to add this to the local.conf file:: @@ -66,15 +63,3 @@ enable_plugin networking-odl http://git.openstack.org/openstack/networking-odl SKIP_OVS_INSTALL=True Q_ML2_PLUGIN_MECHANISM_DRIVERS=opendaylight - -10. Note: Optionally, to use the new netvirt implementation - (netvirt-vpnservice-openstack), add the following to the local.conf file - (only allinone topology is currently supported by devstack, since tunnel - endpoints are not automatically configured). For tunnel configurations - after loading devstack, please refer to this guide - https://wiki.opendaylight.org/view/Netvirt:_L2Gateway_HowTo#Configuring_Tunnels:: - - > cat local.conf - [[local|localrc]] - ODL_NETVIRT_KARAF_FEATURE=odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-netvirt-vpnservice-openstack - ODL_BOOT_WAIT_URL=restconf/operational/network-topology:network-topology/ # Workaround since netvirt:1 no longer exists in DS! diff --git a/networking-odl/devstack/entry_points b/networking-odl/devstack/entry_points index 647960f..939839a 100644 --- a/networking-odl/devstack/entry_points +++ b/networking-odl/devstack/entry_points @@ -54,9 +54,8 @@ function configure_opendaylight { fi fi - # Configure L3 if the user wants it for NETVIRT_OVSDB - # L3 is always enabled in NETVIRT_VPNSERVICE - if [[ ",$ODL_NETVIRT_KARAF_FEATURE," =~ ",$ODL_NETVIRT_KARAF_FEATURE_OVSDB," ]] && [ "${ODL_L3}" == "True" ]; then + # Configure L3 if the user wants it + if [ "${ODL_L3}" == "True" ]; then # Configure L3 FWD if it's not there local L3FWD=$(cat $ODL_DIR/$ODL_NAME/etc/custom.properties | \ grep ^ovsdb.l3.fwd.enabled) @@ -129,10 +128,6 @@ function configure_neutron_odl { populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2_odl username=$ODL_USERNAME populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2_odl password=$ODL_PASSWORD populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2_odl port_binding_controller=$ODL_PORT_BINDING_CONTROLLER - # When it's not set, the default value is set by networking-odl - if [[ -n "$ODL_HOSTCONF_URI" ]]; then - populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2_odl odl_hostconf_uri=$ODL_HOSTCONF_URI - fi } function configure_neutron_odl_lightweight_testing { @@ -254,6 +249,7 @@ function cleanup_opendaylight_compute { done } + # bind_opendaylight_controller() - set control manager to OVS function bind_opendaylight_controller { echo_summary "Initializing OpenDaylight" @@ -263,13 +259,9 @@ function bind_opendaylight_controller { read ovstbl <<< $(sudo ovs-vsctl get Open_vSwitch . _uuid) local ODL_MANAGERS_PARAM=() for manager in $(echo $ODL_OVS_MANAGERS | tr "," "\n"); do - # ovsdbd doesn't understand localhost. replace it to numerical ip address - ODL_MANAGERS_PARAM=( "${ODL_MANAGERS_PARAM[@]}" "tcp:${manager/localhost/127.0.0.1}:$ODL_MGR_PORT" ) + ODL_MANAGERS_PARAM=( "${ODL_MANAGERS_PARAM[@]}" "tcp:$manager:$ODL_MGR_PORT" ) done - # don't overwrite the already existing managers - local ODL_MANAGERS_OLD=$(sudo ovs-vsctl get-manager) - local ODL_MANAGERS=$(echo $ODL_MANAGERS_OLD ${ODL_MANAGERS_PARAM[@]} | tr ' ' '\n' | sort | uniq | tr '\n' ' ') - sudo ovs-vsctl set-manager ${ODL_MANAGERS} + sudo ovs-vsctl set-manager ${ODL_MANAGERS_PARAM[@]} if [[ -n "$ODL_PROVIDER_MAPPINGS" ]]; then sudo ovs-vsctl set Open_vSwitch $ovstbl \ other_config:provider_mappings=$ODL_PROVIDER_MAPPINGS @@ -277,6 +269,7 @@ function bind_opendaylight_controller { sudo ovs-vsctl set Open_vSwitch $ovstbl other_config:local_ip=$ODL_LOCAL_IP } + # unbind_opendaylight_controller() - disconnect controller from switch and clear bridges function unbind_opendaylight_controller { sudo ovs-vsctl del-manager diff --git a/networking-odl/devstack/functions b/networking-odl/devstack/functions index ebd14da..970828d 100644 --- a/networking-odl/devstack/functions +++ b/networking-odl/devstack/functions @@ -20,46 +20,48 @@ function odl_update_maven_metadata_xml { wget -O $MAVENMETAFILE ${NEXUSPATH}/${BUNDLEVERSION}/maven-metadata.xml } -function _odl_export_snapshot_url_pkg { +function odl_export_snapshot_url_pkg { local ODL_DIR=$1 local ODL_URL_PREFIX=$2 local BUNDLEVERSION=$3 local OFFLINE=$4 - local BUNDLE_TIMESTAMP=$5 local MAVENMETAFILE=$ODL_DIR/maven-metadata.xml - local NEXUSPATH="${ODL_URL_PREFIX}/${ODL_URL_SNAPSHOT_REPOSITORY_PATH}/org/opendaylight/integration/distribution-karaf" - - if [ "$BUNDLE_TIMESTAMP" == "latest" ]; then - odl_update_maven_metadata_xml $MAVENMETAFILE $NEXUSPATH $BUNDLEVERSION $OFFLINE - if is_ubuntu; then - install_package libxml-xpath-perl - BUNDLE_TIMESTAMP=`xpath -e "//snapshotVersion[extension='zip'][1]/value/text()" $MAVENMETAFILE 2>/dev/null` - else - yum_install perl-XML-XPath - BUNDLE_TIMESTAMP=`xpath $MAVENMETAFILE "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null` - fi + local NEXUSPATH="${ODL_URL_PREFIX}/content/repositories/opendaylight.snapshot/org/opendaylight/integration/distribution-karaf" + local BUNDLE_TIMESTAMP + + odl_update_maven_metadata_xml $MAVENMETAFILE $NEXUSPATH $BUNDLEVERSION $OFFLINE + if is_ubuntu; then + install_package libxml-xpath-perl + BUNDLE_TIMESTAMP=`xpath -e "//snapshotVersion[extension='zip'][1]/value/text()" $MAVENMETAFILE 2>/dev/null` + else + yum_install perl-XML-XPath + BUNDLE_TIMESTAMP=`xpath $MAVENMETAFILE "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null` fi export ODL_URL=${NEXUSPATH}/${BUNDLEVERSION} export ODL_PKG=distribution-karaf-${BUNDLE_TIMESTAMP}.zip + + # The network virtualization feature used by opendaylight loaded by Karaf + ODL_NETVIRT_KARAF_FEATURE=${ODL_NETVIRT_KARAF_FEATURE:-odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-ovsdb-openstack} + + # The url that this version of ODL netvirt can use to know ODL is fully up + export ODL_BOOT_WAIT_URL=${ODL_BOOT_WAIT_URL:-restconf/operational/network-topology:network-topology/topology/netvirt:1} } -function _odl_export_release_url_pkg { +function odl_export_release_url_pkg { local ODL_URL_PREFIX=$1 local BUNDLEVERSION=$2 - local NEXUSPATH="${ODL_URL_PREFIX}/${ODL_URL_RELEASE_REPOSITORY_PATH}/org/opendaylight/integration/distribution-karaf" + local NEXUSPATH="${ODL_URL_PREFIX}/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf" export ODL_URL=${NEXUSPATH}/${BUNDLEVERSION} export ODL_PKG=distribution-karaf-${BUNDLEVERSION}.zip -} -function setup_opendaylight_package { - if [[ -n "$ODL_SNAPSHOT_VERSION" ]]; then - _odl_export_snapshot_url_pkg ${ODL_DIR} ${ODL_URL_PREFIX} ${ODL_BUNDLEVERSION} ${OFFLINE} ${ODL_SNAPSHOT_VERSION} - else - _odl_export_release_url_pkg ${ODL_URL_PREFIX} ${ODL_BUNDLEVERSION} - fi + # The network virtualization feature used by opendaylight loaded by Karaf + ODL_NETVIRT_KARAF_FEATURE=${ODL_NETVIRT_KARAF_FEATURE:-odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-ovsdb-openstack} + + # The url that this version of ODL netvirt can use to know ODL is fully up + export ODL_BOOT_WAIT_URL=${ODL_BOOT_WAIT_URL:-restconf/operational/network-topology:network-topology/topology/netvirt:1} } # Test if OpenDaylight is enabled diff --git a/networking-odl/devstack/odl-releases/beryllium-0.4.0 b/networking-odl/devstack/odl-releases/beryllium-0.4.0 index 4ed5b73..b7f996a 100644 --- a/networking-odl/devstack/odl-releases/beryllium-0.4.0 +++ b/networking-odl/devstack/odl-releases/beryllium-0.4.0 @@ -1,4 +1,9 @@ -export ODL_BUNDLEVERSION='0.4.0-Beryllium' +export BUNDLEVERSION='0.4.0-Beryllium' +export ODL_NAME=distribution-karaf-${BUNDLEVERSION} # Java major version required to run OpenDaylight: 7, 8, ... ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-8} + +function setup_opendaylight_package { + odl_export_release_url_pkg ${ODL_URL_PREFIX} ${BUNDLEVERSION} +} diff --git a/networking-odl/devstack/odl-releases/beryllium-0.4.1-SR1 b/networking-odl/devstack/odl-releases/beryllium-0.4.1-SR1 index f659a38..b71dd0a 100644 --- a/networking-odl/devstack/odl-releases/beryllium-0.4.1-SR1 +++ b/networking-odl/devstack/odl-releases/beryllium-0.4.1-SR1 @@ -1,4 +1,9 @@ -export ODL_BUNDLEVERSION='0.4.1-Beryllium-SR1' +export BUNDLEVERSION='0.4.1-Beryllium-SR1' +export ODL_NAME=distribution-karaf-${BUNDLEVERSION} # Java major version required to run OpenDaylight: 7, 8, ... ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-8} + +function setup_opendaylight_package { + odl_export_release_url_pkg ${ODL_URL_PREFIX} ${BUNDLEVERSION} +} diff --git a/networking-odl/devstack/odl-releases/beryllium-0.4.2-SR2 b/networking-odl/devstack/odl-releases/beryllium-0.4.2-SR2 deleted file mode 100644 index 230682b..0000000 --- a/networking-odl/devstack/odl-releases/beryllium-0.4.2-SR2 +++ /dev/null @@ -1,4 +0,0 @@ -export ODL_BUNDLEVERSION='0.4.2-Beryllium-SR2' - -# Java major version required to run OpenDaylight: 7, 8, ... -ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-8} diff --git a/networking-odl/devstack/odl-releases/beryllium-0.4.3-SR3 b/networking-odl/devstack/odl-releases/beryllium-0.4.3-SR3 deleted file mode 100644 index 2edebc0..0000000 --- a/networking-odl/devstack/odl-releases/beryllium-0.4.3-SR3 +++ /dev/null @@ -1,4 +0,0 @@ -export ODL_BUNDLEVERSION='0.4.3-Beryllium-SR3' - -# Java major version required to run OpenDaylight: 7, 8, ... -ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-8} diff --git a/networking-odl/devstack/odl-releases/beryllium-snapshot-0.4.2 b/networking-odl/devstack/odl-releases/beryllium-snapshot-0.4.2 new file mode 100644 index 0000000..9d2d823 --- /dev/null +++ b/networking-odl/devstack/odl-releases/beryllium-snapshot-0.4.2 @@ -0,0 +1,9 @@ +BUNDLEVERSION='0.4.2-SNAPSHOT' +export ODL_NAME=distribution-karaf-${BUNDLEVERSION} + +# Java major version required to run OpenDaylight: 7, 8, ... +ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-8} + +function setup_opendaylight_package { + odl_export_snapshot_url_pkg ${ODL_DIR} ${ODL_URL_PREFIX} ${BUNDLEVERSION} ${OFFLINE} +} diff --git a/networking-odl/devstack/odl-releases/beryllium-snapshot-0.4.3 b/networking-odl/devstack/odl-releases/beryllium-snapshot-0.4.3 deleted file mode 100644 index a0d8ecc..0000000 --- a/networking-odl/devstack/odl-releases/beryllium-snapshot-0.4.3 +++ /dev/null @@ -1,5 +0,0 @@ -ODL_BUNDLEVERSION='0.4.3-SNAPSHOT' -ODL_SNAPSHOT_VERSION=${ODL_SNAPSHOT_VERSION:-latest} - -# Java major version required to run OpenDaylight: 7, 8, ... -ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-8} diff --git a/networking-odl/devstack/odl-releases/beryllium-snapshot-0.4.4 b/networking-odl/devstack/odl-releases/beryllium-snapshot-0.4.4 deleted file mode 100644 index 3ea7fac..0000000 --- a/networking-odl/devstack/odl-releases/beryllium-snapshot-0.4.4 +++ /dev/null @@ -1,5 +0,0 @@ -ODL_BUNDLEVERSION='0.4.4-SNAPSHOT' -ODL_SNAPSHOT_VERSION=${ODL_SNAPSHOT_VERSION:-latest} - -# Java major version required to run OpenDaylight: 7, 8, ... -ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-8} diff --git a/networking-odl/devstack/odl-releases/boron-snapshot-0.5.0 b/networking-odl/devstack/odl-releases/boron-snapshot-0.5.0 index 1afdb92..31a042a 100644 --- a/networking-odl/devstack/odl-releases/boron-snapshot-0.5.0 +++ b/networking-odl/devstack/odl-releases/boron-snapshot-0.5.0 @@ -1,5 +1,9 @@ -ODL_BUNDLEVERSION='0.5.0-SNAPSHOT' -ODL_SNAPSHOT_VERSION=${ODL_SNAPSHOT_VERSION:-latest} +BUNDLEVERSION='0.5.0-SNAPSHOT' +export ODL_NAME=distribution-karaf-${BUNDLEVERSION} # Java major version required to run OpenDaylight: 7, 8, ... ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-8} + +function setup_opendaylight_package { + odl_export_snapshot_url_pkg ${ODL_DIR} ${ODL_URL_PREFIX} ${BUNDLEVERSION} ${OFFLINE} +} diff --git a/networking-odl/devstack/odl-releases/carbon-snapshot-0.6.0 b/networking-odl/devstack/odl-releases/carbon-snapshot-0.6.0 deleted file mode 100644 index 102de66..0000000 --- a/networking-odl/devstack/odl-releases/carbon-snapshot-0.6.0 +++ /dev/null @@ -1,5 +0,0 @@ -ODL_BUNDLEVERSION='0.6.0-SNAPSHOT' -ODL_SNAPSHOT_VERSION=${ODL_SNAPSHOT_VERSION:-latest} - -# Java major version required to run OpenDaylight: 7, 8, ... -ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-8} diff --git a/networking-odl/devstack/odl-releases/common b/networking-odl/devstack/odl-releases/common deleted file mode 100644 index ec57dd9..0000000 --- a/networking-odl/devstack/odl-releases/common +++ /dev/null @@ -1,14 +0,0 @@ -# karaf distribution name of ODL to download -export ODL_NAME=${ODL_NAME:-distribution-karaf-${ODL_BUNDLEVERSION}} - -# The network virtualization older feature name (ovsdb based) -export ODL_NETVIRT_KARAF_FEATURE_OVSDB=${ODL_NETVIRT_KARAF_FEATURE_OVSDB:-odl-ovsdb-openstack} - -# The network virtualization newer feature name (vpnservice based) -export ODL_NETVIRT_KARAF_FEATURE_VPNSERVICE=${ODL_NETVIRT_KARAF_FEATURE_VPNSERVICE:-odl-netvirt-openstack} - -# The network virtualization feature used by opendaylight loaded by Karaf -export ODL_NETVIRT_KARAF_FEATURE=${ODL_NETVIRT_KARAF_FEATURE:-odl-neutron-service,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,$ODL_NETVIRT_KARAF_FEATURE_OVSDB} - -# The url that this version of ODL netvirt can use to know ODL is fully up -export ODL_BOOT_WAIT_URL=${ODL_BOOT_WAIT_URL:-restconf/operational/network-topology:network-topology/topology/netvirt:1} diff --git a/networking-odl/devstack/odl-releases/helium-0.2.3-SR3 b/networking-odl/devstack/odl-releases/helium-0.2.3-SR3 index 70149e9..ca51cf2 100644 --- a/networking-odl/devstack/odl-releases/helium-0.2.3-SR3 +++ b/networking-odl/devstack/odl-releases/helium-0.2.3-SR3 @@ -4,14 +4,13 @@ export ODL_NAME=distribution-karaf-0.2.3-Helium-SR3 # Java major version required to run OpenDaylight: 7, 8, ... ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-7} -# overwrite this function function setup_opendaylight_package { # The OpenDaylight URL export ODL_URL=${ODL_URL_PREFIX}/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.2.3-Helium-SR3 # The OpenDaylight Package export ODL_PKG=distribution-karaf-0.2.3-Helium-SR3.zip -} -# The network virtualization feature used by opendaylight loaded by Karaf -ODL_NETVIRT_KARAF_FEATURE=${ODL_NETVIRT_KARAF_FEATURE:-odl-base-all,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-adsal-northbound,odl-nsf-all,odl-ovsdb-northbound,odl-ovsdb-openstack} + # The network virtualization feature used by opendaylight loaded by Karaf + ODL_NETVIRT_KARAF_FEATURE=${ODL_NETVIRT_KARAF_FEATURE:-odl-base-all,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-adsal-northbound,odl-nsf-all,odl-ovsdb-northbound,odl-ovsdb-openstack} +} diff --git a/networking-odl/devstack/odl-releases/lithium-0.3.1-SR1 b/networking-odl/devstack/odl-releases/lithium-0.3.1-SR1 index 81283a7..ff23095 100644 --- a/networking-odl/devstack/odl-releases/lithium-0.3.1-SR1 +++ b/networking-odl/devstack/odl-releases/lithium-0.3.1-SR1 @@ -1,4 +1,9 @@ -export ODL_BUNDLEVERSION='0.3.1-Lithium-SR1' +export BUNDLEVERSION='0.3.1-Lithium-SR1' +export ODL_NAME=distribution-karaf-${BUNDLEVERSION} # Java major version required to run OpenDaylight: 7, 8, ... ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-7} + +function setup_opendaylight_package { + odl_export_release_url_pkg ${ODL_URL_PREFIX} ${BUNDLEVERSION} +} diff --git a/networking-odl/devstack/odl-releases/lithium-0.3.2-SR2 b/networking-odl/devstack/odl-releases/lithium-0.3.2-SR2 index ff52cad..d603409 100644 --- a/networking-odl/devstack/odl-releases/lithium-0.3.2-SR2 +++ b/networking-odl/devstack/odl-releases/lithium-0.3.2-SR2 @@ -1,4 +1,9 @@ -export ODL_BUNDLEVERSION='0.3.2-Lithium-SR2' +export BUNDLEVERSION='0.3.2-Lithium-SR2' +export ODL_NAME=distribution-karaf-${BUNDLEVERSION} # Java major version required to run OpenDaylight: 7, 8, ... ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-7} + +function setup_opendaylight_package { + odl_export_release_url_pkg ${ODL_URL_PREFIX} ${BUNDLEVERSION} +} diff --git a/networking-odl/devstack/odl-releases/lithium-0.3.3-SR3 b/networking-odl/devstack/odl-releases/lithium-0.3.3-SR3 index a1ff407..2480d07 100644 --- a/networking-odl/devstack/odl-releases/lithium-0.3.3-SR3 +++ b/networking-odl/devstack/odl-releases/lithium-0.3.3-SR3 @@ -1,4 +1,9 @@ -export ODL_BUNDLEVERSION='0.3.3-Lithium-SR3' +export BUNDLEVERSION='0.3.3-Lithium-SR3' +export ODL_NAME=distribution-karaf-${BUNDLEVERSION} # Java major version required to run OpenDaylight: 7, 8, ... ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-7} + +function setup_opendaylight_package { + odl_export_release_url_pkg ${ODL_URL_PREFIX} ${BUNDLEVERSION} +} diff --git a/networking-odl/devstack/odl-releases/lithium-0.3.4-SR4 b/networking-odl/devstack/odl-releases/lithium-0.3.4-SR4 index da2f692..6dc5cd6 100644 --- a/networking-odl/devstack/odl-releases/lithium-0.3.4-SR4 +++ b/networking-odl/devstack/odl-releases/lithium-0.3.4-SR4 @@ -1,4 +1,9 @@ -export ODL_BUNDLEVERSION='0.3.4-Lithium-SR4' +export BUNDLEVERSION='0.3.4-Lithium-SR4' +export ODL_NAME=distribution-karaf-${BUNDLEVERSION} # Java major version required to run OpenDaylight: 7, 8, ... ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-7} + +function setup_opendaylight_package { + odl_export_release_url_pkg ${ODL_URL_PREFIX} ${BUNDLEVERSION} +} diff --git a/networking-odl/devstack/odl-releases/lithium-snapshot-0.3.5 b/networking-odl/devstack/odl-releases/lithium-snapshot-0.3.5 new file mode 100644 index 0000000..73aa50f --- /dev/null +++ b/networking-odl/devstack/odl-releases/lithium-snapshot-0.3.5 @@ -0,0 +1,9 @@ +BUNDLEVERSION='0.3.5-SNAPSHOT' +export ODL_NAME=distribution-karaf-${BUNDLEVERSION} + +# Java major version required to run OpenDaylight: 7, 8, ... +ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-7} + +function setup_opendaylight_package { + odl_export_snapshot_url_pkg ${ODL_DIR} ${ODL_URL_PREFIX} ${BUNDLEVERSION} ${OFFLINE} +} diff --git a/networking-odl/devstack/override-defaults b/networking-odl/devstack/override-defaults index 399a528..82ec60e 100644 --- a/networking-odl/devstack/override-defaults +++ b/networking-odl/devstack/override-defaults @@ -3,14 +3,7 @@ # We will enable the opendaylight ML2 MechanismDriver v1 version by default. # Note we are also enabling the logger driver, which is helpful for # debugging things on the Neutron side. -if [[ "$ODL_V2DRIVER" == "True" ]] -then - V2_POSTFIX="_v2" -else - V2_POSTFIX="" -fi - -Q_ML2_PLUGIN_MECHANISM_DRIVERS=${Q_ML2_PLUGIN_MECHANISM_DRIVERS:-"opendaylight${V2_POSTFIX},logger"} +Q_ML2_PLUGIN_MECHANISM_DRIVERS=${Q_ML2_PLUGIN_MECHANISM_DRIVERS:-"opendaylight,logger"} # This triggers the provisioning of L3 resources like routers and # external network, if not overriden. @@ -23,11 +16,10 @@ disable_service q-agt # If ODL_L3 is enabled, then we don't need the L3 agent and OpenDaylight # is going to act as the ML2's L3 service plugin. -# NETVIRT_VPNSERVICE feature enables ODL L3 by default, so ODL_L3 is disregarded. -if [[ ",$ODL_NETVIRT_KARAF_FEATURE," =~ ",$ODL_NETVIRT_KARAF_FEATURE_VPNSERVICE," ]] || [ "$ODL_L3" == "True" ]; +if [[ "$ODL_L3" == "True" ]] then disable_service q-l3 - ML2_L3_PLUGIN="${ML2_L3_PLUGIN:-odl-router${V2_POSTFIX}}" + ML2_L3_PLUGIN="${ML2_L3_PLUGIN:-odl-router}" fi # [networking-feature-enabled] api-extensions diff --git a/networking-odl/devstack/plugin.sh b/networking-odl/devstack/plugin.sh index a65840d..1f76b0f 100644 --- a/networking-odl/devstack/plugin.sh +++ b/networking-odl/devstack/plugin.sh @@ -24,7 +24,6 @@ source $TOP_DIR/lib/neutron_plugins/ovs_base # Import ODL settings source $NETWORKING_ODL_DIR/devstack/settings.odl source $NETWORKING_ODL_DIR/devstack/odl-releases/$ODL_RELEASE -source $NETWORKING_ODL_DIR/devstack/odl-releases/common # Utilities functions for setting up Java source $NETWORKING_ODL_DIR/devstack/setup_java.sh @@ -78,10 +77,7 @@ if is_service_enabled odl-compute; then fi bind_opendaylight_controller wait_for_active_bridge $OVS_BR $ODL_RETRY_SLEEP_INTERVAL $ODL_BOOT_WAIT - - # L3 needs to be configured only for netvirt-ovsdb - in netvirt-vpnservice L3 is configured - # by provider_mappings, and the provider mappings are added to br-int by default - if [[ ",$ODL_NETVIRT_KARAF_FEATURE," =~ ",$ODL_NETVIRT_KARAF_FEATURE_OVSDB," ]] && [ "${ODL_L3}" == "True" ]; then + if [ "${ODL_L3}" == "True" ]; then configure_opendaylight_l3 fi elif [[ "$1" == "stack" && "$2" == "extra" ]]; then diff --git a/networking-odl/devstack/pre_test_hook.sh b/networking-odl/devstack/pre_test_hook.sh index df11e2a..fbb7f7e 100644 --- a/networking-odl/devstack/pre_test_hook.sh +++ b/networking-odl/devstack/pre_test_hook.sh @@ -7,14 +7,14 @@ GATE_DEST=$BASE/new DEVSTACK_PATH=$GATE_DEST/devstack case "$ODL_RELEASE_BASE" in - carbon-snapshot) - ODL_RELEASE=carbon-snapshot-0.6.0 - ;; boron-snapshot) ODL_RELEASE=boron-snapshot-0.5.0 ;; beryllium-snapshot) - ODL_RELEASE=beryllium-snapshot-0.4.4 + ODL_RELEASE=beryllium-snapshot-0.4.2 + ;; + lithium-snapshot) + ODL_RELEASE=lithium-snapshot-0.3.5 ;; *) echo "Unknown ODL release base: $ODL_RELEASE_BASE" @@ -22,36 +22,6 @@ case "$ODL_RELEASE_BASE" in ;; esac -case "$ODL_GATE_V2DRIVER" in - v2driver) - ODL_V2DRIVER=True - ;; - v1driver|*) - ODL_V2DRIVER=False - ;; -esac - -case "$ODL_GATE_PORT_BINDING" in - pseudo-agentdb-binding) - ODL_PORT_BINDING_CONTROLLER=pseudo-agentdb-binding - ;; - legacy-port-binding) - ODL_PORT_BINDING_CONTROLLER=legacy-port-binding - ;; - network-topology|*) - ODL_PORT_BINDING_CONTROLLER=network-topology - ;; -esac - -case "$ODL_GATE_SERVICE_PROVIDER" in - vpnservice) - ODL_NETVIRT_KARAF_FEATURE=odl-neutron-service,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-netvirt-openstack - ;; - netvirt|*) - ODL_NETVIRT_KARAF_FEATURE=odl-neutron-service,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-ovsdb-openstack - ;; -esac - cat <<EOF >> $DEVSTACK_PATH/localrc IS_GATE=True @@ -59,15 +29,6 @@ IS_GATE=True # Set here the ODL release to use for the Gate job ODL_RELEASE=${ODL_RELEASE} -# Set here which driver, v1 or v2 driver -ODL_V2DRIVER=${ODL_V2DRIVER} - -# Set here which port binding controller -ODL_PORT_BINDING_CONTROLLER=${ODL_PORT_BINDING_CONTROLLER} - -# Set here which ODL openstack service provider to use -ODL_NETVIRT_KARAF_FEATURE=${ODL_NETVIRT_KARAF_FEATURE} - # Switch to using the ODL's L3 implementation ODL_L3=True diff --git a/networking-odl/devstack/settings.odl b/networking-odl/devstack/settings.odl index 1ce23a4..5a1040b 100644 --- a/networking-odl/devstack/settings.odl +++ b/networking-odl/devstack/settings.odl @@ -3,21 +3,18 @@ # What release to use. Choices are: # -# carbon-snapshot-0.6.0 (master) -# boron-snapshot-0.5.0 (stable/boron) -# beryllium-snapshot-0.4.4 (stable/beryllium) -# beryllium-snapshot-0.4.3 (stable/beryllium) -# beryllium-0.4.3-SR3 -# beryllium-0.4.2-SR2 +# boron-snapshot-0.5.0 (master) +# beryllium-snapshot-0.4.2 (stable/beryllium) # beryllium-0.4.1-SR1 # beryllium-0.4.0 +# lithium-snapshot-0.3.5 (stable/lithium) # lithium-0.3.4-SR4 (SR4) # lithium-0.3.3-SR3 (SR3) # lithium-0.3.2-SR2 (SR2) # lithium-0.3.1-SR1 (SR1) # helium-0.2.3-SR3 -ODL_RELEASE=${ODL_RELEASE:-boron-snapshot-0.5.0} +ODL_RELEASE=${ODL_RELEASE:-beryllium-snapshot-0.4.2} # The IP address of ODL. Set this in local.conf. ODL_MGR_IP=${ODL_MGR_IP:-$SERVICE_HOST} @@ -45,18 +42,9 @@ ODL_USERNAME=${ODL_USERNAME:-admin} # The ODL password ODL_PASSWORD=${ODL_PASSWORD:-admin} -# use v2 type driver -# this requires post mitaka -ODL_V2DRIVER=${ODL_V2DRIVER:-False} - # The OpenDaylight URL PREFIX ODL_URL_PREFIX=${ODL_URL_PREFIX:-https://nexus.opendaylight.org} -# OpenDaylight snapshot & release repositories paths -# Can be overidden in case you host proxy repositories which have a different diretory structure than OpenDaylight's -ODL_URL_SNAPSHOT_REPOSITORY_PATH=${ODL_URL_SNAPSHOT_REPOSITORY_PATH:-content/repositories/opendaylight.snapshot} -ODL_URL_RELEASE_REPOSITORY_PATH=${ODL_URL_RELEASE_REPOSITORY_PATH:-content/repositories/opendaylight.release} - # How long (in seconds) to pause after ODL starts to let it complete booting ODL_BOOT_WAIT=${ODL_BOOT_WAIT:-600} @@ -102,15 +90,5 @@ ODL_RETRY_SLEEP_INTERVAL=${ODL_RETRY_SLEEP_INTERVAL:-5} # Skip installation of distribution provided Open vSwitch SKIP_OVS_INSTALL=$(trueorfalse False SKIP_OVS_INSTALL) -# The ODL Restconf URL -# URI to hostconfigs: empty for default value -ODL_HOSTCONF_URI=${ODL_HOSTCONF_URI:-} - # Port binding controller ODL_PORT_BINDING_CONTROLLER=${ODL_PORT_BINDING_CONTROLLER:-network-topology} - -# Snapshot version - allows using a specific version e.g. 0.5.0-20160719.101233-3643 -# latest: check the latest snapshot -# specific version: the specific version of the snapshot -# "": odl release -ODL_SNAPSHOT_VERSION=${ODL_SNAPSHOT_VERSION:-} |