Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Provision the ssh key added in 3c8c524
......................................................................
Provision the ssh key added in 3c8c524
Provision the dsa key ganeti requires and will otherwise autocreate
And of course the corresponding private key in the private repo
Change-Id: Ibf6975adcca2f0b3f64db712d33b7d136af48283
---
A files/ganeti/id_dsa.pub
M manifests/role/ganeti.pp
2 files changed, 9 insertions(+), 6 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/files/ganeti/id_dsa.pub b/files/ganeti/id_dsa.pub
new file mode 100644
index 0000000..a595046
--- /dev/null
+++ b/files/ganeti/id_dsa.pub
@@ -0,0 +1 @@
+ssh-dss
AAAAB3NzaC1kc3MAAACBAJfVkgJZd1HUpaDjfQWyZcOajV/vq3kaTNlp5dZL2KXaFGFs6Yo97n9Y2ZRY1J7qtKEeBOVBwGYodtgFTx72fESELqapM8bT7ngg+ucJlalFzDCMc0BQFHClzYtabxH6c5JLCNODmX8PD/lHnRIPcCNGBhDQebhcNtWTTvNnnh1hAAAAFQDe7NPuaXcL3szVMFpCvmZ2l1t/owAAAIEAgHjzyC4W1G22lHTnqEquUdhany9Wfpwc5eKidFEAVw1XxTFhx8GtUPby/BZ1jz6Q2keqJvM+ZjcBTyBQxEY330BkXl0m0JRbQgtZaglIA8dnbHMnVFQ67pDVEtd0Alobj3WW5jqGLn6CKwqgEX3fSqSgNMn+SAKG0qnnKZ5cTCkAAACAbQxXYK6icSMgb5kTPjKW9kDt2Y8VrEg/2QwVZF963Rm+By+cRettZtGdgADEF2pF/gKJCEMCWwzvtHtE2aK6P9k15wK7FuwFT5+QLiPTo/t93CHr69b1mGSogYADj82422q8jUZTJjwu8cn+bucP1TUERa82I64Mlwqb3dPFDpU=
ganeti
diff --git a/manifests/role/ganeti.pp b/manifests/role/ganeti.pp
index 63f735c..b714460 100644
--- a/manifests/role/ganeti.pp
+++ b/manifests/role/ganeti.pp
@@ -4,25 +4,27 @@
include ::ganeti
# Ganeti needs intracluster SSH root access
- ssh::userkey { 'root':
+ ssh::userkey { 'root-ganeti':
ensure => present,
- source => 'puppet:///files/ganeti/id_rsa.pub',
+ skey => 'ganeti',
+ source => 'puppet:///ganeti/id_dsa.pub',
}
- file { '/root/.ssh/id_rsa':
+ # And the private key
+ file { '/root/.ssh/id_dsa':
ensure => present,
owner => 'root',
group => 'root',
mode => '0400',
- source => 'puppet:///private/files/ganeti/id_rsa',
+ source => 'puppet:///private/ganeti/id_dsa',
}
# This is here for completeness
- file { '/root/.ssh/id_rsa.pub':
+ file { '/root/.ssh/id_dsa.pub':
ensure => present,
owner => 'root',
group => 'root',
mode => '0400',
- source => 'puppet:///files/ganeti/id_rsa.pub',
+ source => 'puppet:///ganeti/id_dsa.pub',
}
# If ganeti_cluster fact is not defined, the node has not been added to a
--
To view, visit https://gerrit.wikimedia.org/r/201462
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf6975adcca2f0b3f64db712d33b7d136af48283
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
