Andrew Bogott has submitted this change and it was merged.

Change subject: Fixups for labs password generation:
......................................................................


Fixups for labs password generation:

- Include 'whois' package for mkpasswd
- The password dir needs to be owned by puppet so
  puppet can write the passwords there.

Bug: T142216
Change-Id: Ib0321e2aed1a7db4b94e74e0c6ad62c6515ba105
---
M modules/puppetmaster/manifests/labsrootpass.pp
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/puppetmaster/manifests/labsrootpass.pp 
b/modules/puppetmaster/manifests/labsrootpass.pp
index 6599ef0..d8acfce 100644
--- a/modules/puppetmaster/manifests/labsrootpass.pp
+++ b/modules/puppetmaster/manifests/labsrootpass.pp
@@ -12,6 +12,7 @@
 class puppetmaster::labsrootpass {
 
     require_package('pwgen')
+    require_package('whois')
 
     file { '/usr/local/sbin/make-labs-root-password':
         ensure => 'present',
@@ -23,6 +24,7 @@
 
     file { '/var/local/labs-root-passwords':
         ensure => 'directory',
+        owner  => 'puppet',
         mode   => '0700',
     }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/303826
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0321e2aed1a7db4b94e74e0c6ad62c6515ba105
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to