echo 0
}
-function fix_libvirt_version_n_cpu_ocata() {
+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/ocata;
- sed -i s/libvirt-python===2.5.0/libvirt-python===3.2.0/ upper-constraints.txt
+ git checkout stable/pike;
+ sed -i s/libvirt-python===3.5.0/libvirt-python===4.2.0/ upper-constraints.txt
"
}
${SSH} ${ip} "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-queens/rdo-release-queens-1.noarch.rpm"
;;
- *ocata*)
- ${SSH} ${ip} "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-ocata/rdo-release-ocata-3.noarch.rpm"
- ;;
-
master)
${SSH} ${ip} "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-queens/rdo-release-queens-1.noarch.rpm"
;;
if [ "${ODL_ML2_DRIVER_VERSION}" == "v2" ]; then
echo "ODL_V2DRIVER=True" >> ${local_conf_file_name}
fi
-
IFS=,
for plugin_name in ${ENABLE_OS_PLUGINS}; do
if [ "$plugin_name" == "networking-odl" ]; then
ENABLE_PLUGIN_ARGS="${DEVSTACK_LBAAS_PLUGIN_REPO} ${OPENSTACK_BRANCH}"
IS_LBAAS_PLUGIN_ENABLED="yes"
elif [ "$plugin_name" == "networking-sfc" ]; then
- ENABLE_PLUGIN_ARGS="${DEVSTACK_NETWORKING_SFC_PLUGIN_REPO} ${OPENSTACK_BRANCH}"
+ ENABLE_PLUGIN_ARGS="${DEVSTACK_NETWORKING_SFC_PLUGIN_REPO} master"
+ IS_SFC_PLUGIN_ENABLED="yes"
else
echo "Error: Invalid plugin $plugin_name, unsupported"
continue
if [ "${IS_LBAAS_PLUGIN_ENABLED}" == "yes" ]; then
SERVICE_PLUGINS+=", lbaasv2"
fi
+ if [ "${IS_SFC_PLUGIN_ENABLED}" == "yes" ]; then
+ SERVICE_PLUGINS+=", networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin,networking_sfc.services.sfc.plugin.SfcPlugin"
+ fi
fi #check for ODL_ENABLE_L3_FWD
cat >> ${local_conf_file_name} << EOF
mkdir -p ${TEMPEST_LOGS_DIR}
scp ${OPENSTACK_CONTROL_NODE_1_IP}:${DEVSTACK_TEMPEST_DIR}/tempest_results.html ${TEMPEST_LOGS_DIR}
scp ${OPENSTACK_CONTROL_NODE_1_IP}:${DEVSTACK_TEMPEST_DIR}/tempest.log ${TEMPEST_LOGS_DIR}
- if [ "$(echo ${OPENSTACK_BRANCH} | cut -d/ -f2)" != "queens" ]; then
- mv ${WORKSPACE}/tempest_output* ${TEMPEST_LOGS_DIR}
- fi
else
echo "tempest results not found in ${DEVSTACK_TEMPEST_DIR}/${TESTREPO}/0"
fi
local -r ip=${1}
local grepfor="nova_cell1"
rm -f rabbit.txt
- if [ "${OPENSTACK_BRANCH}" == "stable/ocata" ]; then
- ${SSH} ${ip} "sudo rabbitmqctl status" > rabbit.txt
- grepfor="pid"
- else
- ${SSH} ${ip} "sudo rabbitmqctl list_vhosts" > rabbit.txt
- fi
+ ${SSH} ${ip} "sudo rabbitmqctl list_vhosts" > rabbit.txt
grep ${grepfor} rabbit.txt
}
ssh ${!CONTROLIP} "sed -i 's/flat_networks public/flat_networks public,physnet1/' /opt/stack/devstack/lib/neutron"
ssh ${!CONTROLIP} "sed -i '186i iniset \$NEUTRON_CORE_PLUGIN_CONF ml2_type_vlan network_vlan_ranges public:1:4094,physnet1:1:4094' /opt/stack/devstack/lib/neutron"
fi
- if [[ "${ODL_ML2_BRANCH}" == "stable/ocata" && "$(is_openstack_feature_enabled n-cpu)" == "1" ]]; then
- echo "Updating requirements for ${ODL_ML2_BRANCH}"
- echo "Workaround for https://review.openstack.org/#/c/491032/"
- echo "Modify upper-constraints to use libvirt-python 3.2.0"
- fix_libvirt_version_n_cpu_ocata ${!CONTROLIP}
- fi
create_control_node_local_conf ${!CONTROLIP} ${ODLMGRIP[$i]} "${ODL_OVS_MGRS[$i]}"
scp ${WORKSPACE}/local.conf_control_${!CONTROLIP} ${!CONTROLIP}:/opt/stack/devstack/local.conf
echo "Install rdo release to avoid incompatible Package versions"
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/ocata" ]; then
+ if [ "${ODL_ML2_BRANCH}" == "stable/pike" ]; then
echo "Updating requirements for ${ODL_ML2_BRANCH}"
- echo "Workaround for https://review.openstack.org/#/c/491032/"
- echo "Modify upper-constraints to use libvirt-python 3.2.0"
- fix_libvirt_version_n_cpu_ocata ${!COMPUTEIP}
+ 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 "sleep for 60s and print hypervisor-list"
sleep 60
- # In Ocata if we do not enable the n-cpu in control node then
- # we need to discover hosts manually and ensure that they are mapped to cells.
- # reference: https://ask.openstack.org/en/question/102256/how-to-configure-placement-service-for-compute-node-on-ocata/
- if [ "${OPENSTACK_BRANCH}" == "stable/ocata" ]; then
- scp ${WORKSPACE}/setup_host_cell_mapping.sh ${!CONTROLIP}:/tmp
- ${SSH} ${!CONTROLIP} "sudo bash /tmp/setup_host_cell_mapping.sh"
- fi
${SSH} ${!CONTROLIP} "cd /opt/stack/devstack; source openrc admin admin; nova hypervisor-list"
# in the case that we are doing openstack (control + compute) all in one node, then the number of hypervisors
# will be the same as the number of openstack systems. However, if we are doing multinode openstack then the