From e7cdec3736534b3a2c88af1a793583aa43af9779 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Wed, 30 Apr 2014 20:02:33 +0000
Subject: [PATCH] Stop over-managing user SSH keyfiles

* modules/user/manifests/virtual/localuser.pp: This reverts part of
0d82c62 which was providing a temporary transition correcting
permissions and ownership as well as removing the results of a
previous failed implementation of keyfile management. Unfortunately
that also caused nodepool images to no longer set up accounts
correctly, but reverting the transitional bits fixes that issue.

Change-Id: Ic3e7f0a3b82bbc8a23707b88f9fe381e9d70e356
---
 manifests/virtual/localuser.pp | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/manifests/virtual/localuser.pp b/manifests/virtual/localuser.pp
index 77235ff..99eddc2 100644
--- a/manifests/virtual/localuser.pp
+++ b/manifests/virtual/localuser.pp
@@ -29,33 +29,11 @@ define user::virtual::localuser(
     require    => Group[$title],
   }
 
-  file { "${title}_sshdir":
-    ensure  => directory,
-    name    => "${home}/.ssh",
-    owner   => $title,
-    group   => $title,
-    mode    => '0700',
-    require => User[$title],
-  }
-
-  file { "${title}_keyfile":
-    ensure  => present,
-    mode    => '0600',
-    name    => "${home}/.ssh/authorized_keys",
-    require => File["${title}_sshdir"],
-  }
-
   ssh_authorized_key { $key_id:
     ensure  => present,
     key     => $sshkeys,
     user    => $title,
     type    => 'ssh-rsa',
-    require => File["${title}_keyfile"],
-  }
-
-  ssh_authorized_key { "${title}_keys":
-    ensure => absent,
-    user   => $title,
   }
 
   if ( $old_keys != [] ) {