Merge "Revert "Install odl-mdsal-trace in netvirt oxygen csit""

[releng/builder.git] / jjb / integration / integration-deploy-openstack-run-test.sh

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index d7108c9a5a7cb7641dcb0971f693dd8796387e84..89e97643351f507fa3042c766b5cc792d2366a79 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -277,8 +277,10 @@ EOF
     if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then
         cat >> ${local_conf_file_name} << EOF
 
-enable_plugin networking-l2gw ${NETWORKING_L2GW_DRIVER} ${ODL_ML2_BRANCH}
-NETWORKING_L2GW_SERVICE_DRIVER=L2GW:OpenDaylight:networking_odl.l2gateway.driver.OpenDaylightL2gwDriver:default
+#enable_plugin networking-l2gw ${NETWORKING_L2GW_DRIVER} ${ODL_ML2_BRANCH}
+# Need this until patch https://review.openstack.org/#/c/546994/2 is merged
+enable_plugin networking-l2gw https://github.com/vpickard/networking-l2gw queens-pluginFix
+NETWORKING_L2GW_SERVICE_DRIVER=L2GW:OpenDaylight:networking_odl.l2gateway.driver_v2.OpenDaylightL2gwDriver:default
 EOF
     fi
 
@@ -359,7 +361,8 @@ EOF
     add_os_services "${CORE_OS_COMPUTE_SERVICES}" "${ENABLE_OS_COMPUTE_SERVICES}" "${DISABLE_OS_SERVICES}" "${local_conf_file_name}"
 
     cat >> ${local_conf_file_name} << EOF
-
+#Added to make Nova wait until nova in control node is ready.
+NOVA_READY_TIMEOUT=900
 HOST_IP=${HOSTIP}
 SERVICE_HOST=${SERVICEHOST}
 Q_ML2_TENANT_NETWORK_TYPE=${TENANT_NETWORK_TYPE}
@@ -776,8 +779,8 @@ function get_service () {
 function is_rabbitmq_ready() {
     local -r ip=$1
     rm -f rabbit.txt
-    ${SSH} ${ip} "sudo rabbitmqctl status" > rabbit.txt
-    grep pid rabbit.txt
+    ${SSH} ${ip} "sudo rabbitmqctl list_vhosts" > rabbit.txt
+    grep nova_cell1 rabbit.txt
 }
 
 # retry the given command ($3) until success for a number of iterations ($1)
@@ -1210,10 +1213,6 @@ for i in `seq 1 ${NUM_OPENSTACK_SITES}`; do
         ${SSH} $compute_ip "
             sudo ovs-vsctl add-port $PUBLIC_BRIDGE $CONTROLPORT -- set interface $CONTROLPORT type=vxlan options:local_ip=$compute_ip options:remote_ip=${!CONTROLIP} options:dst_port=9876 options:key=flow
         "
-         #Compute Node - set VXLAN TEP IP for Genius Auto TZ
-        ${SSH} $compute_ip "
-            sudo ovs-vsctl set O . external_ids:tep-ip=${compute_ip};
-        "
     done
 done