From c584f63aa6a081b33e8fd6155955d3b341d0f7eb Mon Sep 17 00:00:00 2001
From: Spencer Krum <spencer.krum@hp.com>
Date: Thu, 11 Sep 2014 15:00:43 -0700
Subject: [PATCH] Allow ssh from the new puppetmaster

Remove old ssh_authorized_key entry

Change-Id: Iec8ca703383650e39a3b2d33d2909d11d1b723a5
---
 modules/openstack_project/manifests/base.pp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/openstack_project/manifests/base.pp b/modules/openstack_project/manifests/base.pp
index 617587c2ec..8ba57dc982 100644
--- a/modules/openstack_project/manifests/base.pp
+++ b/modules/openstack_project/manifests/base.pp
@@ -98,14 +98,18 @@ class openstack_project::base(
     ensure  => absent,
     user    => 'root',
   }
-
   ssh_authorized_key { 'puppet-remote-2014-05-24':
+    ensure  => absent,
+    user    => 'root',
+  }
+
+  ssh_authorized_key { 'puppet-remote-2014-09-11':
     ensure  => present,
     user    => 'root',
     type    => 'ssh-rsa',
     key     => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDSLlN41ftgxkNeUi/kATYPwMPjJdMaSbgokSb9PSkRPZE7GeNai60BCfhu+ky8h5eMe70Bpwb7mQ7GAtHGXPNU1SRBPhMuVN9EYrQbt5KSiwuiTXtQHsWyYrSKtB+XGbl2PhpMQ/TPVtFoL5usxu/MYaakVkCEbt5IbPYNg88/NKPixicJuhi0qsd+l1X1zoc1+Fn87PlwMoIgfLIktwaL8hw9mzqr+pPcDIjCFQQWnjqJVEObOcMstBT20XwKj/ymiH+6p123nnlIHilACJzXhmIZIZO+EGkNF7KyXpcBSfv9efPI+VCE2TOv/scJFdEHtDFkl2kdUBYPC0wQ92rp',
     options => [
-      'from="ci-puppetmaster.openstack.org"',
+      'from="ci-puppetmaster.openstack.org,puppetmaster.openstack.org"',
     ],
     require => File['/root/.ssh'],
   }