Fix puppet tags to not be recursive

mikecanz · Jul 9, 2014 · 8b4ab2d · 8b4ab2d
1 parent 73e27d0
commit 8b4ab2d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/modules/baseline/files/usr/local/bin/fetch_ec2_puppet_tags.pl b/modules/baseline/files/usr/local/bin/fetch_ec2_puppet_tags.pl
@@ -15,7 +15,8 @@
 my $ec2 = Net::Amazon::EC2->new(AWSAccessKeyId  => $config->{'_'}->{'AWSAccessKeyId'},
                                 SecretAccessKey => $config->{'_'}->{'AWSSecretKey'});
 
-chomp(my $instance_id = `facter ec2_instance_id`);
+my $instance_id = `curl --silent http://169.254.169.254/latest/meta-data/instance-id`;
+
 
 my $result = $ec2->describe_tags({'Filter.Name' => 'resource-id', 'Filter.Value' => $instance_id});
 

diff --git a/modules/baseline/files/usr/local/bin/fetch_ec2_tags.pl b/modules/baseline/files/usr/local/bin/fetch_ec2_tags.pl
@@ -15,7 +15,8 @@
 my $ec2 = Net::Amazon::EC2->new(AWSAccessKeyId  => $config->{'_'}->{'AWSAccessKeyId'},
                                 SecretAccessKey => $config->{'_'}->{'AWSSecretKey'});
 
-chomp(my $instance_id = `facter ec2_instance_id`);
+my $instance_id = `curl --silent http://169.254.169.254/latest/meta-data/instance-id`;
+
 
 my $result = $ec2->describe_tags({'Filter.Name' => 'resource-id', 'Filter.Value' => $instance_id});