Blame SOURCES/bz1568589-4-aliyun-vpc-move-ip-bundled.patch

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