diff --git a/manifests/site.pp b/manifests/site.pp index a34d33ca4e..a5a5ac9d06 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -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'), } } diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp index 5cb3285bb1..a6dec4b59e 100644 --- a/modules/openstack_project/manifests/puppetmaster.pp +++ b/modules/openstack_project/manifests/puppetmaster.pp @@ -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,