Merge "Create puppet-forge credentials on the pypi slave"
This commit is contained in:
commit
dc287c08c1
@ -606,6 +606,8 @@ node 'pypi.slave.openstack.org' {
|
||||
jenkinsci_password => hiera('jenkins_ci_org_password', 'XXX'),
|
||||
mavencentral_username => hiera('mavencentral_org_user', 'username'),
|
||||
mavencentral_password => hiera('mavencentral_org_password', 'XXX'),
|
||||
puppet_forge_username => hiera('puppet_forge_username', 'username'),
|
||||
puppet_forge_password => hiera('puppet_forge_password', 'XXX'),
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -22,7 +22,9 @@ class openstack_project::pypi_slave (
|
||||
$jenkinsci_username,
|
||||
$jenkinsci_password,
|
||||
$mavencentral_username,
|
||||
$mavencentral_password
|
||||
$mavencentral_password,
|
||||
$puppet_forge_username,
|
||||
$puppet_forge_password,
|
||||
) {
|
||||
class { 'openstack_project::slave':
|
||||
ssh_key => $jenkins_ssh_public_key,
|
||||
@ -69,4 +71,13 @@ class openstack_project::pypi_slave (
|
||||
require => File['/home/jenkins'],
|
||||
}
|
||||
|
||||
file { '/home/jenkins/.puppetforge.yml':
|
||||
ensure => present,
|
||||
owner => 'jenkins',
|
||||
group => 'jenkins',
|
||||
mode => '0600',
|
||||
content => template('openstack_project/puppetforge.yml.erb'),
|
||||
require => File['/home/jenkins'],
|
||||
}
|
||||
|
||||
}
|
||||
|
4
modules/openstack_project/templates/puppetforge.yml.erb
Normal file
4
modules/openstack_project/templates/puppetforge.yml.erb
Normal file
@ -0,0 +1,4 @@
|
||||
---
|
||||
url: https://forgeapi.puppetlabs.com
|
||||
username: <%= @puppet_forge_username -%>
|
||||
password: <%= @puppet_forge_password -%>
|
Loading…
Reference in New Issue
Block a user