Andrew Bogott has submitted this change and it was merged.
Change subject: nodepool: fill in SSH public key
......................................................................
nodepool: fill in SSH public key
The private key is now in the private repository and fetched using
secret(). Add the public key to the nodepool class.
Also fix an issue with the private key referencing
$jenkins_ssh_private_key instead of $jenkins_ssh_private_key_source
Change-Id: I15a0a9589e8b3ac55ee6ae95530d44dea8a1a75a
---
M manifests/role/nodepool.pp
M modules/nodepool/manifests/init.pp
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/nodepool.pp b/manifests/role/nodepool.pp
index bf5e7ae..ed89ce5 100644
--- a/manifests/role/nodepool.pp
+++ b/manifests/role/nodepool.pp
@@ -17,6 +17,7 @@
jenkins_api_user => 'nodepoolmanager',
jenkins_api_key =>
$passwords::nodepool::jenkins_api_key,
jenkins_credentials_id => 'nodepool-dib-jenkins',
+ jenkins_ssh_public_key => 'ssh-rsa
AAAAB3NzaC1yc2EAAAADAQABAAABAQDrERFfjRBOIoI5ASW0gx/rxSeJX/ThszByypsoA80jCfbcjrfsG94WtOGXYQw4Zjs/8u4DYMfI5aHEZKvk/K4jTAR09J9swFash9ML60AvQx/VFC5ZEDHMBa7dYyzxspDX5v73QEDYG9Hhxo6qfFOLO3IvYfat9CfwQR4/oS2lzV+oIsD68lSy/OoKCpywMs0/pExdP65RHR7xpvAlrgehzKoayfHo5Vzg9dCawj4ZoHsqwCnKG4ctMflyzyN/Lwgniv/+GSjgqf/FNXDCMDJCh+d410IXLS7szY3JTzpWekF82SxIM19CdwKh1R2zPVjUT6hvbm9kOo8Y72ORL2yj
nodepool@labnodepool1001',
jenkins_ssh_private_key_source =>
secret('nodepool/dib_jenkins_id_rsa'),
openstack_auth_uri => $novaconfig['auth_uri'],
openstack_username => 'nodepoolmanager',
diff --git a/modules/nodepool/manifests/init.pp
b/modules/nodepool/manifests/init.pp
index 08c15f5..d7fa33a 100644
--- a/modules/nodepool/manifests/init.pp
+++ b/modules/nodepool/manifests/init.pp
@@ -116,7 +116,7 @@
# Private SSH key
file { '/var/lib/nodepool/.ssh/dib_jenkins_id_rsa':
ensure => present,
- source => $jenkins_ssh_private_key,
+ source => $jenkins_ssh_private_key_source,
owner => 'nodepool',
group => 'nodepool',
mode => '0600',
--
To view, visit https://gerrit.wikimedia.org/r/224049
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I15a0a9589e8b3ac55ee6ae95530d44dea8a1a75a
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
