|
 |
b94b9d |
diff -uNr a/heartbeat/aliyun-vpc-move-ip b/heartbeat/aliyun-vpc-move-ip
|
|
|
b94b9d |
--- a/heartbeat/aliyun-vpc-move-ip 2018-08-03 15:21:34.869664678 +0200
|
|
|
b94b9d |
+++ b/heartbeat/aliyun-vpc-move-ip 2018-08-03 15:22:48.632185198 +0200
|
|
|
b94b9d |
@@ -36,13 +36,13 @@
|
|
|
b94b9d |
ip_drop
|
|
|
b94b9d |
fi
|
|
|
b94b9d |
|
|
|
b94b9d |
- cmd="aliyuncli vpc CreateRouteEntry --RouteTableId $OCF_RESKEY_routing_table --DestinationCidrBlock ${OCF_RESKEY_address}/32 --NextHopId $ECS_INSTANCE_ID --NextHopType Instance --output text"
|
|
|
b94b9d |
+ cmd="aliyuncli-ra vpc CreateRouteEntry --RouteTableId $OCF_RESKEY_routing_table --DestinationCidrBlock ${OCF_RESKEY_address}/32 --NextHopId $ECS_INSTANCE_ID --NextHopType Instance --output text"
|
|
|
b94b9d |
ocf_log debug "executing command: $cmd"
|
|
|
b94b9d |
$cmd
|
|
|
b94b9d |
rc=$?
|
|
|
b94b9d |
while [ $rc -ne 0 ]; do
|
|
|
b94b9d |
sleep 1
|
|
|
b94b9d |
- cmd="aliyuncli vpc CreateRouteEntry --RouteTableId $OCF_RESKEY_routing_table --DestinationCidrBlock ${OCF_RESKEY_address}/32 --NextHopId $ECS_INSTANCE_ID --NextHopType Instance --output text"
|
|
|
b94b9d |
+ cmd="aliyuncli-ra vpc CreateRouteEntry --RouteTableId $OCF_RESKEY_routing_table --DestinationCidrBlock ${OCF_RESKEY_address}/32 --NextHopId $ECS_INSTANCE_ID --NextHopType Instance --output text"
|
|
|
b94b9d |
ocf_log debug "executing command: $cmd"
|
|
|
b94b9d |
$cmd
|
|
|
b94b9d |
rc=$?
|
|
|
b94b9d |
@@ -75,7 +75,7 @@
|
|
|
b94b9d |
return $OCF_ERR_GENERIC
|
|
|
b94b9d |
fi
|
|
|
b94b9d |
|
|
|
b94b9d |
- cmd="aliyuncli vpc DeleteRouteEntry --RouteTableId $OCF_RESKEY_routing_table --DestinationCidrBlock ${OCF_RESKEY_address}/32 --NextHopId $ROUTE_TO_INSTANCE --output text"
|
|
|
b94b9d |
+ cmd="aliyuncli-ra vpc DeleteRouteEntry --RouteTableId $OCF_RESKEY_routing_table --DestinationCidrBlock ${OCF_RESKEY_address}/32 --NextHopId $ROUTE_TO_INSTANCE --output text"
|
|
|
b94b9d |
ocf_log debug "executing command: $cmd"
|
|
|
b94b9d |
$cmd
|
|
|
b94b9d |
if [ $? -ne 0 ]; then
|
|
|
b94b9d |
@@ -90,13 +90,13 @@
|
|
|
b94b9d |
}
|
|
|
b94b9d |
|
|
|
b94b9d |
wait_for_started() {
|
|
|
b94b9d |
- cmd="aliyuncli vpc DescribeRouteTables --RouteTableId $OCF_RESKEY_routing_table --output text"
|
|
|
b94b9d |
+ cmd="aliyuncli-ra vpc DescribeRouteTables --RouteTableId $OCF_RESKEY_routing_table --output text"
|
|
|
b94b9d |
ocf_log debug "executing command: $cmd"
|
|
|
b94b9d |
ROUTE_TO_INSTANCE="$($cmd | grep $OCF_RESKEY_address | awk '{ print $3 }')"
|
|
|
b94b9d |
|
|
|
b94b9d |
while [ "$ECS_INSTANCE_ID" != "$ROUTE_TO_INSTANCE" ]; do
|
|
|
b94b9d |
sleep 3
|
|
|
b94b9d |
- cmd="aliyuncli vpc DescribeRouteTables --RouteTableId $OCF_RESKEY_routing_table --output text"
|
|
|
b94b9d |
+ cmd="aliyuncli-ra vpc DescribeRouteTables --RouteTableId $OCF_RESKEY_routing_table --output text"
|
|
|
b94b9d |
ocf_log debug "executing command: $cmd"
|
|
|
b94b9d |
ROUTE_TO_INSTANCE="$($cmd | grep $OCF_RESKEY_address | awk '{ print $3 }')"
|
|
|
b94b9d |
done
|
|
|
b94b9d |
@@ -107,7 +107,7 @@
|
|
|
b94b9d |
|
|
|
b94b9d |
while [ ! -z "$ROUTE_TO_INSTANCE" ]; do
|
|
|
b94b9d |
sleep 1
|
|
|
b94b9d |
- cmd="aliyuncli vpc DescribeRouteTables --RouteTableId $OCF_RESKEY_routing_table --output text"
|
|
|
b94b9d |
+ cmd="aliyuncli-ra vpc DescribeRouteTables --RouteTableId $OCF_RESKEY_routing_table --output text"
|
|
|
b94b9d |
ocf_log debug "executing command: $cmd"
|
|
|
b94b9d |
ROUTE_TO_INSTANCE="$($cmd |grep $OCF_RESKEY_address | awk '{ print $3 }')"
|
|
|
b94b9d |
done
|
|
|
b94b9d |
@@ -248,7 +248,7 @@
|
|
|
b94b9d |
|
|
|
b94b9d |
ecs_ip_monitor() {
|
|
|
b94b9d |
ocf_log debug "function: ecsip_monitor: check routing table"
|
|
|
b94b9d |
- cmd="aliyuncli vpc DescribeRouteTables --RouteTableId $OCF_RESKEY_routing_table --output text"
|
|
|
b94b9d |
+ cmd="aliyuncli-ra vpc DescribeRouteTables --RouteTableId $OCF_RESKEY_routing_table --output text"
|
|
|
b94b9d |
ocf_log debug "executing command: $cmd"
|
|
|
b94b9d |
|
|
|
b94b9d |
ROUTE_TO_INSTANCE="$($cmd |grep $OCF_RESKEY_address | awk '{ print $3 }')"
|