Alexandros Kosiaris has submitted this change and it was merged.

Change subject: openstack: transition nova to ssh::userkey
......................................................................


openstack: transition nova to ssh::userkey

Bug: T92475
Change-Id: I0d4e826e4ae1ae329bc946498e51bd1ee17d99e8
---
M modules/openstack/manifests/nova/compute.pp
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  Alexandros Kosiaris: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/openstack/manifests/nova/compute.pp 
b/modules/openstack/manifests/nova/compute.pp
index 620b2e3..d22b760 100644
--- a/modules/openstack/manifests/nova/compute.pp
+++ b/modules/openstack/manifests/nova/compute.pp
@@ -31,7 +31,7 @@
                 group   => 'nova',
                 mode    => '0600',
                 require => File["/var/lib/nova/.ssh"];
-            "/var/lib/nova/.ssh/authorized_keys":
+            "/var/lib/nova/.ssh/id_rsa.pub":
                 source  => "puppet:///private/ssh/nova/nova.pub",
                 owner   => 'nova',
                 group   => 'nova',
@@ -61,6 +61,10 @@
         }
     }
 
+    ssh::userkey { 'nova':
+        source  => "puppet:///private/ssh/nova/nova.pub",
+    }
+
     service { "libvirt-bin":
         ensure  => running,
         enable  => true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0d4e826e4ae1ae329bc946498e51bd1ee17d99e8
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to