Merge pull request #439 from qld-gov-au/QOLDEV-892-amazon-linux-2023

QOLDEV-892 fix VPC ID variable syntax
qld-gov-au · Jun 20, 2024 · d4862f6 · d4862f6
2 parents bb1aa93 + 4253126
commit d4862f6
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/recipes/stackparams.rb b/recipes/stackparams.rb
@@ -24,7 +24,7 @@
 #
 
 # Retrieve attributes from instance metadata
-metadata_token=`curl -X PUT -H "X-aws-ec2-metadata-token-ttl-seconds: 60" http://169.254.169.254/latest/api/token`
+metadata_token=`curl -X PUT -H "X-aws-ec2-metadata-token-ttl-seconds: 300" http://169.254.169.254/latest/api/token`
 node.default['datashades']['region'] = `curl -H "X-aws-ec2-metadata-token: #{metadata_token}" http:/169.254.169.254/latest/meta-data/placement/region`
 node.default['datashades']['instid'] = `curl -H "X-aws-ec2-metadata-token: #{metadata_token}" http:/169.254.169.254/latest/meta-data/instance-id`
 
@@ -59,8 +59,8 @@
 bash "Get VPC CIDR" do
 	user "root"
 	code <<-EOS
-		mac_id = `curl -H "X-aws-ec2-metadata-token: #{metadata_token}" http:/169.254.169.254/latest/meta-data/network/interfaces/macs`
-		vpc_id = `curl -H "X-aws-ec2-metadata-token: #{metadata_token}" http:/169.254.169.254/latest/meta-data/network/interfaces/macs/$mac_id/vpc-id`
+		mac_id=`curl -H "X-aws-ec2-metadata-token: #{metadata_token}" http:/169.254.169.254/latest/meta-data/network/interfaces/macs`
+		vpc_id=`curl -H "X-aws-ec2-metadata-token: #{metadata_token}" http:/169.254.169.254/latest/meta-data/network/interfaces/macs/$mac_id/vpc-id`
 		aws ec2 describe-vpcs --region "#{node['datashades']['region']}" --vpc-ids "$vpc_id" | jq '.Vpcs[].CidrBlock' | tr -d '"' > /etc/vpccidr
 	EOS
 end