Faidon Liambotis has submitted this change and it was merged.
Change subject: ssh: guard ssh_known_hosts generation behind $::realm
......................................................................
ssh: guard ssh_known_hosts generation behind $::realm
An if $::realm makes me sad but this needs to be fixed ASAP.
Change-Id: I4d36e86559d45c7f7406008ac9acfe44eb92c4db
---
M modules/ssh/manifests/client.pp
1 file changed, 9 insertions(+), 7 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, but someone else must approve
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ssh/manifests/client.pp b/modules/ssh/manifests/client.pp
index 87f3582..1f91c07 100644
--- a/modules/ssh/manifests/client.pp
+++ b/modules/ssh/manifests/client.pp
@@ -3,12 +3,14 @@
ensure => latest,
}
- file { '/etc/ssh/ssh_known_hosts':
- content => generate('/usr/local/bin/sshknowngen'),
- backup => false,
- owner => 'root',
- group => 'root',
- mode => '0644',
+ # no exported resources on Labs == no sshknowngen
+ if $::realm == 'production' {
+ file { '/etc/ssh/ssh_known_hosts':
+ content => generate('/usr/local/bin/sshknowngen'),
+ backup => false,
+ owner => 'root',
+ group => 'root',
+ mode => '0644',
+ }
}
-
}
--
To view, visit https://gerrit.wikimedia.org/r/214353
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4d36e86559d45c7f7406008ac9acfe44eb92c4db
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
