Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions openstack/tools/allocate_vips.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ j=1
for i in $(seq ${vip_start_suffix} ${net_end}); do
echo openstack port create --network net_${OS_USERNAME}-psd \
--fixed-ip subnet=subnet_${OS_USERNAME}-psd,ip-address=${net_pre}.$i \
--disable --os-cloud ps6 ps6-vip-ip$( printf "%02d" $j )
--disable ps-vip-ip$( printf "%02d" $j )
j=$((j+1))
done
done
2 changes: 1 addition & 1 deletion openstack/tools/func_test_tools/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ create_zaza_vip ()
local vip_id=$1
# We use the same naming convention as ../tools/allocate_vips.sh to avoid conflicts and re-use
# those vips.
vip_port_name=ps6-vip-ip$vip_id
vip_port_name=ps-vip-ip$vip_id
vip_addr=$(openstack port show -c fixed_ips $vip_port_name -f yaml| yq .fixed_ips[0].ip_address)
if [[ $vip_addr = null ]]; then
# Pre-allocate ports with addresses used for VIPs so that they don't
Expand Down
Loading