BUNDLE_URL: ${BUNDLE_URL}
CONTROLLERFEATURES: ${CONTROLLERFEATURES}
CONTROLLERDEBUGMAP: ${CONTROLLERDEBUGMAP}
+SCRIPTPLAN: ${SCRIPTPLAN}
+CONFIGPLAN: ${CONFIGPLAN}
+STREAMTESTPLAN: ${STREAMTESTPLAN}
TESTPLAN: ${TESTPLAN}
SUITES: ${SUITES}
PATCHREFSPEC: ${PATCHREFSPEC}
done
if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then
- #networking-l2gw is not officially available in any release yet. Gettting the latest stable version.
+ #networking-l2gw is not officially available in any release yet. Getting the latest stable version.
$PYTHON -m pip install networking-l2gw==11.0.0
fi
}
echo 0
}
-function fix_libvirt_version_n_cpu_pike() {
- local ip=$1
- ${SSH} ${ip} "
- cd /opt/stack;
- git clone https://git.openstack.org/openstack/requirements;
- cd requirements;
- git checkout stable/pike;
- sed -i s/libvirt-python===3.5.0/libvirt-python===4.2.0/ upper-constraints.txt
- "
-}
-
#Function to install rdo release
# This will help avoiding installing wrong version of packages which causes
# functionality failures
return ${rc}
}
-# if we are using the new netvirt impl, as determined by the feature name
-# odl-netvirt-openstack (note: old impl is odl-ovsdb-openstack) then we
-# want PROVIDER_MAPPINGS to be used -- this should be fixed if we want to support
-# external networks in legacy netvirt
-if [[ ${CONTROLLERFEATURES} == *"odl-netvirt-openstack"* ]]; then
- ODL_PROVIDER_MAPPINGS="\${PUBLIC_PHYSICAL_NETWORK}:${PUBLIC_BRIDGE}"
-else
- ODL_PROVIDER_MAPPINGS=
-fi
-
-# if we are using the old netvirt impl, as determined by the feature name
-# odl-ovsdb-openstack (note: new impl is odl-netvirt-openstack) then we
-# want ODL_L3 to be True. New impl wants it False
-if [[ ${CONTROLLERFEATURES} == *"odl-ovsdb-openstack"* ]]; then
- ODL_L3=True
-else
- ODL_L3=False
-fi
-
+ODL_PROVIDER_MAPPINGS="\${PUBLIC_PHYSICAL_NETWORK}:${PUBLIC_BRIDGE}"
+ODL_L3=False
RECLONE=False
ODL_PORT=8181
scp ${WORKSPACE}/get_devstack.sh ${!CONTROLIP}:/tmp
# devstack Master is yet to migrate fully to lib/neutron, there are some ugly hacks that is
# affecting the stacking.
- #Workaround For Queens, Make the physical Network as physnet1 in lib/neutron
- #Workaround Comment out creating initial Networks in lib/neutron
+ # Workaround For Queens, Make the physical Network as physnet1 in lib/neutron
+ # In Queens the neutron new libs are used and do not have the following options from Pike and earlier:
+ # Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS could be used for the flat_networks
+ # and Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS could be used for the ml2_type_vlan
${SSH} ${!CONTROLIP} "bash /tmp/get_devstack.sh > /tmp/get_devstack.sh.txt 2>&1"
if [ "${ODL_ML2_BRANCH}" == "stable/queens" ]; then
ssh ${!CONTROLIP} "sed -i 's/flat_networks public/flat_networks public,physnet1/' /opt/stack/devstack/lib/neutron"
scp ${WORKSPACE}/hosts_file ${!COMPUTEIP}:/tmp/hosts
scp ${WORKSPACE}/get_devstack.sh ${!COMPUTEIP}:/tmp
${SSH} ${!COMPUTEIP} "bash /tmp/get_devstack.sh > /tmp/get_devstack.sh.txt 2>&1"
- if [ "${ODL_ML2_BRANCH}" == "stable/pike" ]; then
- echo "Updating requirements for ${ODL_ML2_BRANCH}"
- echo "Workaround for libvirt-python failing installation"
- echo "Modify upper-constraints to use libvirt-python 4.2.0"
- fix_libvirt_version_n_cpu_pike ${!COMPUTEIP}
- fi
create_compute_node_local_conf ${!COMPUTEIP} ${!CONTROLIP} ${ODLMGRIP[$SITE_INDEX]} "${ODL_OVS_MGRS[$SITE_INDEX]}"
scp ${WORKSPACE}/local.conf_compute_${!COMPUTEIP} ${!COMPUTEIP}:/opt/stack/devstack/local.conf
echo "Install rdo release to avoid incompatible Package versions"