Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214332
Change subject: ssh: remove fail()s from ssh::userkey
......................................................................
ssh: remove fail()s from ssh::userkey
If they're indeed fails, File will complain.
Change-Id: I7205d189af1d8796817bab227554be1928c83959
---
M modules/ssh/manifests/userkey.pp
1 file changed, 0 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/32/214332/1
diff --git a/modules/ssh/manifests/userkey.pp b/modules/ssh/manifests/userkey.pp
index a6dc702..028da67 100644
--- a/modules/ssh/manifests/userkey.pp
+++ b/modules/ssh/manifests/userkey.pp
@@ -44,14 +44,6 @@
$content = undef,
) {
- if $source == undef and $content == undef {
- fail('you must provide either "source" or "content"')
- }
-
- if $source != undef and $content != undef {
- fail('"source" and "content" are mutually exclusive')
- }
-
if $skey {
if !defined(File["/etc/ssh/userkeys/${user}.d/"]) {
file { "/etc/ssh/userkeys/${user}.d/":
--
To view, visit https://gerrit.wikimedia.org/r/214332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7205d189af1d8796817bab227554be1928c83959
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
