Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/75247
Change subject: Fixing multi instance hostname issue
......................................................................
Fixing multi instance hostname issue
Change-Id: Ie29bbf633266c7a8568a0e506f63f4308f10d40f
---
M manifests/role/puppet.pp
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/47/75247/1
diff --git a/manifests/role/puppet.pp b/manifests/role/puppet.pp
index 6a54def..76823b0 100644
--- a/manifests/role/puppet.pp
+++ b/manifests/role/puppet.pp
@@ -56,10 +56,10 @@
undef => 'localhost',
'localhost' => 'localhost',
'' => 'localhost',
- # if only word characters, assume that this is a short hostname
- /^\w+$/ => "${::puppetmaster}::${::domain}",
- # else use assume fqdn
- default => $::puppetmaster,
+ # if has . characters in in, assume fqdn.
+ /\./ => $::puppetmaster,
+ # else assume short hostname and append domain.
+ default => "${::puppetmaster}.${::domain}",
}
# If localhost or if $server matches this node's
--
To view, visit https://gerrit.wikimedia.org/r/75247
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie29bbf633266c7a8568a0e506f63f4308f10d40f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
