opendev/system-config
Code Issues Proposed changes

Merge "Remove unused param from puppetmaster class"

Browse Source
This commit is contained in:
Jenkins 2016-05-13 21:13:37 +00:00 committed by Gerrit Code Review
commit 6df0d79fa0
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/site.pp
View File

@ -235,7 +235,6 @@ node 'puppetmaster.openstack.org' {
jenkins_api_user => hiera('jenkins_api_user', 'username'),
jenkins_api_key => hiera('jenkins_api_key'),
puppetmaster_clouds => hiera('puppetmaster_clouds'),
infracloud_hpuswest_ssl_cert_file_contents => hiera('infracloud_hpuswest_ssl_cert_file_contents'),
}
}

9
modules/openstack_project/manifests/puppetmaster.pp
View File

@ -3,7 +3,6 @@
class openstack_project::puppetmaster (
$jenkins_api_key,
$puppetmaster_clouds,
$infracloud_hpuswest_ssl_cert_file_contents,
$jenkins_api_user = 'hudson-openstack',
$root_rsa_key = 'xxx',
$puppetdb = true,
@ -136,14 +135,6 @@ class openstack_project::puppetmaster (
content => template('openstack_project/puppetmaster/all-clouds.yaml.erb'),
}
file { '/etc/openstack/infracloud_west_cacert.pem':
ensure => absent,
owner => 'root',
group => 'admin',
mode => '0660',
content => $infracloud_hpuswest_ssl_cert_file_contents,
}
# For puppet master apache serving.
package { 'puppetmaster-passenger':
ensure => present,