From 59b0840d262900d0eaa8b19df3ede55eea5250d2 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Wed, 17 Mar 2021 12:10:59 +0100 Subject: [PATCH] AWS agents: dont spam log files when getting token --- heartbeat/aws-vpc-move-ip | 2 +- heartbeat/aws-vpc-route53.in | 2 +- heartbeat/awseip | 2 +- heartbeat/awsvip | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/heartbeat/aws-vpc-move-ip b/heartbeat/aws-vpc-move-ip index cbb629b00..3ca3d6bd6 100755 --- a/heartbeat/aws-vpc-move-ip +++ b/heartbeat/aws-vpc-move-ip @@ -215,7 +215,7 @@ ec2ip_validate() { return $OCF_ERR_CONFIGURED fi - TOKEN=$(curl -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600") + TOKEN=$(curl -sX PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600") EC2_INSTANCE_ID=$(curl -s http://169.254.169.254/latest/meta-data/instance-id -H "X-aws-ec2-metadata-token: $TOKEN") if [ -z "${EC2_INSTANCE_ID}" ]; then diff --git a/heartbeat/aws-vpc-route53.in b/heartbeat/aws-vpc-route53.in index 4fb17019b..21948eaca 100644 --- a/heartbeat/aws-vpc-route53.in +++ b/heartbeat/aws-vpc-route53.in @@ -347,7 +347,7 @@ r53_monitor() { _get_ip() { case $OCF_RESKEY_ip in local|public) - TOKEN=$(curl -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600") + TOKEN=$(curl -sX PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600") IPADDRESS=$(curl -s http://169.254.169.254/latest/meta-data/${OCF_RESKEY_ip}-ipv4 -H "X-aws-ec2-metadata-token: $TOKEN");; *.*.*.*) IPADDRESS="${OCF_RESKEY_ip}";; diff --git a/heartbeat/awseip b/heartbeat/awseip index de1967774..12ffffaa3 100755 --- a/heartbeat/awseip +++ b/heartbeat/awseip @@ -244,7 +244,7 @@ AWSCLI="${OCF_RESKEY_awscli}" ELASTIC_IP="${OCF_RESKEY_elastic_ip}" ALLOCATION_ID="${OCF_RESKEY_allocation_id}" PRIVATE_IP_ADDRESS="${OCF_RESKEY_private_ip_address}" -TOKEN=$(curl -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600") +TOKEN=$(curl -sX PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600") INSTANCE_ID=$(curl -s http://169.254.169.254/latest/meta-data/instance-id -H "X-aws-ec2-metadata-token: $TOKEN") case $__OCF_ACTION in diff --git a/heartbeat/awsvip b/heartbeat/awsvip index 8050107e8..7d0bf35b6 100755 --- a/heartbeat/awsvip +++ b/heartbeat/awsvip @@ -206,7 +206,7 @@ esac AWSCLI="${OCF_RESKEY_awscli}" SECONDARY_PRIVATE_IP="${OCF_RESKEY_secondary_private_ip}" -TOKEN=$(curl -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600") +TOKEN=$(curl -sX PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600") INSTANCE_ID=$(curl -s http://169.254.169.254/latest/meta-data/instance-id -H "X-aws-ec2-metadata-token: $TOKEN") MAC_ADDRESS=$(curl -s http://169.254.169.254/latest/meta-data/mac -H "X-aws-ec2-metadata-token: $TOKEN") NETWORK_ID=$(curl -s http://169.254.169.254/latest/meta-data/network/interfaces/macs/${MAC_ADDRESS}/interface-id -H "X-aws-ec2-metadata-token: $TOKEN")