Faidon Liambotis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/350254 )
Change subject: Rename ipaddress_primary to ipaddress (same for 6)
......................................................................
Rename ipaddress_primary to ipaddress (same for 6)
Rename the ipaddress_primary fact to just ipaddress (same for
ipaddress6_primary/ipaddress6) and use Facter's has_weight mechanism to
override the default ipaddress/ipaddress6 facts.
The default facts are inaccurate in many occasions and ours are much
more reliable, especially in our infrastructure. Instead of changing all
the references across the tree, override the default ones thus making
ipaddress/ipaddress6 the canonical versions again.
Bug: T163196
Change-Id: I771d1eac6d1dd7fd75b05f529559b9fb2a6fcfb4
---
M modules/base/lib/facter/interface_primary.rb
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/350254/1
diff --git a/modules/base/lib/facter/interface_primary.rb
b/modules/base/lib/facter/interface_primary.rb
index f4eefef..911ffc9 100644
--- a/modules/base/lib/facter/interface_primary.rb
+++ b/modules/base/lib/facter/interface_primary.rb
@@ -27,16 +27,18 @@
end
end
-Facter.add('ipaddress_primary') do
+Facter.add('ipaddress') do
confine :kernel => :linux
+ has_weight 100
setcode do
intf = Facter.fact('interface_primary').value
Facter.fact('ipaddress_' + intf).value
end
end
-Facter.add('ipaddress6_primary') do
+Facter.add('ipaddress6') do
confine :kernel => :linux
+ has_weight 100
setcode do
ip = nil
intf = Facter.fact('interface_primary').value
--
To view, visit https://gerrit.wikimedia.org/r/350254
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I771d1eac6d1dd7fd75b05f529559b9fb2a6fcfb4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
