X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-deploy-openstack-run-test.sh;h=d413310a92be2adef584261d91668d2d73b2aca2;hb=f618ffefcc5a3904f0fdcc2db3bcb88323bcd425;hp=db564427982d8c4c3da54227919389e17e8154cd;hpb=4d74025762ebb7ce1db755b0aa5bd336645bf5f4;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh index db5644279..d413310a9 100644 --- a/jjb/integration/integration-deploy-openstack-run-test.sh +++ b/jjb/integration/integration-deploy-openstack-run-test.sh @@ -285,10 +285,6 @@ minimize_polling=True physical_network_mtus = ${PUBLIC_PHYSICAL_NETWORK}:1400 path_mtu = 1458 -# workaround for port-status not working due to https://bugs.opendaylight.org/show_bug.cgi?id=9092 -[ml2_odl] -odl_features=nothing - [[post-config|/etc/neutron/dhcp_agent.ini]] [DEFAULT] force_metadata = True @@ -898,7 +894,7 @@ done for i in `seq 1 ${NUM_OPENSTACK_CONTROL_NODES}`; do CONTROLIP=OPENSTACK_CONTROL_NODE_${i}_IP - echo "Configure the stack of the control node ${i} of ${NUM_OPENSTACK_CONTROL_NODES}: ${CONTROLIP}" + echo "Configure the stack of the control node ${i} of ${NUM_OPENSTACK_CONTROL_NODES}: ${!CONTROLIP}" scp ${WORKSPACE}/disable_firewall.sh ${!CONTROLIP}:/tmp ${SSH} ${!CONTROLIP} "sudo bash /tmp/disable_firewall.sh" create_etc_hosts ${!CONTROLIP} @@ -948,7 +944,7 @@ for i in `seq 1 ${NUM_OPENSTACK_COMPUTE_NODES}`; do SITE_INDEX=$((((i - 1) / NUM_COMPUTES_PER_SITE) + 1)) # We need the site index to infer the control node IP for this compute COMPUTEIP=OPENSTACK_COMPUTE_NODE_${i}_IP CONTROLIP=OPENSTACK_CONTROL_NODE_${SITE_INDEX}_IP - echo "Configure the stack of the compute node ${i} of ${NUM_OPENSTACK_COMPUTE_NODES}: ${COMPUTEIP}" + echo "Configure the stack of the compute node ${i} of ${NUM_OPENSTACK_COMPUTE_NODES}: ${!COMPUTEIP}" scp ${WORKSPACE}/disable_firewall.sh "${!COMPUTEIP}:/tmp" ${SSH} "${!COMPUTEIP}" "sudo bash /tmp/disable_firewall.sh" create_etc_hosts ${!COMPUTEIP} ${!CONTROLIP}