Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227201
Change subject: Remove custom fact ec2id (2nd try), unused
......................................................................
Remove custom fact ec2id (2nd try), unused
All uses of $::ec2id within puppet have been removed, no reason to carry
this fact anymore.
Change-Id: I7dd66d906b819aa82a325487d0dd7b65586c62f5
---
D modules/base/lib/facter/ec2id.rb
M modules/puppet/manifests/self/master.pp
2 files changed, 0 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/01/227201/1
diff --git a/modules/base/lib/facter/ec2id.rb b/modules/base/lib/facter/ec2id.rb
deleted file mode 100644
index 1d2d61e..0000000
--- a/modules/base/lib/facter/ec2id.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# ec2id.rb
-#
-# This fact provides ec2id (old-timey instance id) for instances in labs.
-# This is used to set the puppet certname, among other things.
-
-require 'facter'
-
-Facter.add(:ec2id) do
- setcode do
- domain = Facter::Util::Resolution.exec("hostname -d").chomp
- if domain.include? "wmflabs"
- Facter::Util::Resolution.exec("curl -f
http://169.254.169.254/1.0/meta-data/instance-id 2> /dev/null").chomp
- else
- ""
- end
- end
-end
-
diff --git a/modules/puppet/manifests/self/master.pp
b/modules/puppet/manifests/self/master.pp
index c987131..fc63434 100644
--- a/modules/puppet/manifests/self/master.pp
+++ b/modules/puppet/manifests/self/master.pp
@@ -44,7 +44,6 @@
}
# If localhost, then just name the cert 'localhost'.
- # Else certname should be the labs instanceid. ($::ec2id comes from
instance metadata.)
$certname = $server ? {
'localhost' => 'localhost',
default => $fqdn
--
To view, visit https://gerrit.wikimedia.org/r/227201
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7dd66d906b819aa82a325487d0dd7b65586c62f5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
