Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Configure tep-ip for genius auto tunnels"
[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 f379260aa75dbc586c7fe8d7c227aac4f5a9da5b..4d331abd32f15dc9c71fef12054c5c56152f5fdc 100644
(file)
--- a/
jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/
jjb/integration/integration-deploy-openstack-run-test.sh
@@
-1081,6
+1081,10
@@
for i in `seq 1 ${NUM_OPENSTACK_SITES}`; do
sudo ip netns exec pnf_ns ifconfig pnf_veth1 up ${EXTNET_PNF_IP}/24;
sudo ovs-vsctl add-port ${PUBLIC_BRIDGE} pnf_veth0;
"
sudo ip netns exec pnf_ns ifconfig pnf_veth1 up ${EXTNET_PNF_IP}/24;
sudo ovs-vsctl add-port ${PUBLIC_BRIDGE} pnf_veth0;
"
+ # Control Node - set VXLAN TEP IP for Genius Auto TZ
+ ${SSH} ${!CONTROLIP} "
+ sudo ovs-vsctl set O . external_ids:tep-ip=${!CONTROLIP};
+ "
# Control Node - external net internet address simulation
${SSH} ${!CONTROLIP} "
# Control Node - external net internet address simulation
${SSH} ${!CONTROLIP} "
@@
-1101,6
+1105,10
@@
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
"
${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
done
done