opendev/system-config
Code Issues Proposed changes

Remove unused param from puppetmaster class

Browse Source 
We require an infracloud ssl param, which later on we use it to
make absent that file.
This is probably safe to remove now.

Change-Id: Id64853eaaf84a7cd1a9e73c7fdf377f85fb8747c
This commit is contained in:
Ricardo Carrillo Cruz 2016-04-29 22:55:31 +02:00
parent 4babed90be
commit 9a2cd3842a
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_user => hiera('jenkins_api_user', 'username'),
jenkins_api_key => hiera('jenkins_api_key'), jenkins_api_key => hiera('jenkins_api_key'),
puppetmaster_clouds => hiera('puppetmaster_clouds'), 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 ( class openstack_project::puppetmaster (
$jenkins_api_key, $jenkins_api_key,
$puppetmaster_clouds, $puppetmaster_clouds,
$infracloud_hpuswest_ssl_cert_file_contents,
$jenkins_api_user = 'hudson-openstack', $jenkins_api_user = 'hudson-openstack',
$root_rsa_key = 'xxx', $root_rsa_key = 'xxx',
$puppetdb = true, $puppetdb = true,
@ -136,14 +135,6 @@ class openstack_project::puppetmaster (
content => template('openstack_project/puppetmaster/all-clouds.yaml.erb'), 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. # For puppet master apache serving.
package { 'puppetmaster-passenger': package { 'puppetmaster-passenger':
ensure => present, ensure => present,