[MediaWiki-commits] [Gerrit] Revert "Allow addition of more root keys via hiera" - change (labs/private)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: Revert "Allow addition of more root keys via hiera"
......................................................................


Revert "Allow addition of more root keys via hiera"

This reverts commit 7c0e9698d533a75df256a2fece6331383482e90d.

Change-Id: I4e56839da3ebca25f9d0e276db099bad90f7a27d
---
R files/ssh/root-authorized-keys
M modules/passwords/manifests/init.pp
2 files changed, 2 insertions(+), 11 deletions(-)

Approvals:
  Yuvipanda: Verified; Looks good to me, approved



diff --git a/templates/ssh/root-authorized-keys.erb 
b/files/ssh/root-authorized-keys
similarity index 98%
rename from templates/ssh/root-authorized-keys.erb
rename to files/ssh/root-authorized-keys
index b927288..8ee9807 100644
--- a/templates/ssh/root-authorized-keys.erb
+++ b/files/ssh/root-authorized-keys
@@ -22,4 +22,3 @@
 ssh-rsa 
AAAAB3NzaC1yc2EAAAADAQABAAABAQDNsOh6zGdO5A+BrTc9F7wR21vGrM7If5V8vp065cZtLjOSyjCioWYVhvyrRYFzKKhaGfUNDkSGO2sZ331HWXqr2dppSMVEXtbs7qtVtnBAqhKXEo8Z8VfjtpckbPR9qwEVRlv329Dp1g0uloKow8v6kF7NoKHQgCgiO2l/eQncrEXVg3XrgA7xkgYXUakKaSPwS3UuCtnzEh1Uf9pMg5bvujdeMpzqSiXOyxgPVYaPl/YM3MPUg6y9JsuMn8PBVkVmj4coVzHwCjrV3rZDbmpF37Ru0cUTvUqGUyPFdY1fIMd5pyxQe6h87kni3bKby1ES7JNfuVAsGHei9C3khL8R
 jeffgerard@jgerard-mbp.local
 # Filippo
 ssh-rsa 
AAAAB3NzaC1yc2EAAAADAQABAAABAQDt7HkyaZeIe7L8CuWE1+N47+wDT/4cUmEcrPA1xgdA4By/jesf+1oOTvusbIyXFuCssvspgGmwwNMD+PzNF3xAEo+Yn2aqH4OBhRiF0U8jeaJL1EhzKnT8KKG4fOzzerbKFlE5K9LnYhMXp2i6MoAN9xB3Z350dBwqhspf0OKqZ8AGbsc9RdcEr2pBT7RPRlcKXRTrd47keV+PUazpDVSr2MCdmErknROpcBh5IS27DrKHpma3UcNUGIeMsvsV6nyt8Tz2+EMGkd+P+whij0YzlKDkqB2ppoD+gCPAki277wobiocea79fvPm1/Na+tpXJT7gU+YErld4VRvUclyR/
 fgiunch...@wikimedia.org
-<%= @flat_extra_keys %>
diff --git a/modules/passwords/manifests/init.pp 
b/modules/passwords/manifests/init.pp
index 0193b52..ac845a0 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -4,22 +4,14 @@
 ##################################################
 ##################################################
 
-class passwords::root(
-    $extra_keys = undef,
-){
+class passwords::root {
     user { 'root':
         password => '!',
     }
 
-    if $extra_keys {
-        $flat_extra_keys = join(values($extra_keys), "\n")
-    } else {
-        $flat_extra_keys = ''
-    }
-
     ssh::userkey { 'root':
         ensure => present,
-        content => template('ssh/root-authorized-keys.erb'),
+        source => 'puppet:///private/ssh/root-authorized-keys',
     }
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4e56839da3ebca25f9d0e276db099bad90f7a27d
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits