openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Correct TLS cert permission" into stable/train

This commit is contained in:
Zuul 2023-06-26 22:27:03 +00:00 committed by Gerrit Code Review
parent e60b46efd7 e0687aa02b
commit 9912f82672
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/profile/base/metrics/qdr.pp
View File

@ -218,7 +218,7 @@ class tripleo::profile::base::metrics::qdr (
file { $ssl_cert_dir: file { $ssl_cert_dir:
ensure => directory, ensure => directory,
mode => '0700' mode => '0755'
} }
$prep_ssl_profiles = qdr_ssl_certificate($ssl_profiles, $ssl_cert_dir) $prep_ssl_profiles = qdr_ssl_certificate($ssl_profiles, $ssl_cert_dir)
$final_ssl_profiles = $prep_ssl_profiles.reduce( [] ) |$memo, $prf| { $final_ssl_profiles = $prep_ssl_profiles.reduce( [] ) |$memo, $prf| {
@ -226,7 +226,7 @@ class tripleo::profile::base::metrics::qdr (
file { $prf['caCertFile']: file { $prf['caCertFile']:
ensure => present, ensure => present,
content => $prf['caCertFileContent'], content => $prf['caCertFileContent'],
mode => '0600', mode => '0644',
require => File[$ssl_cert_dir] require => File[$ssl_cert_dir]
} }
$memo << delete($prf, 'caCertFileContent') $memo << delete($prf, 'caCertFileContent')

6
spec/classes/tripleo_profile_base_metrics_qdr_spec.rb
View File

@ -207,17 +207,17 @@ describe 'tripleo::profile::base::metrics::qdr' do
]) ])
is_expected.to contain_file('/tmp/certs').with( is_expected.to contain_file('/tmp/certs').with(
:ensure => 'directory', :ensure => 'directory',
:mode => '0700' :mode => '0755'
) )
is_expected.to contain_file('/tmp/certs/CA_wubba.pem').with( is_expected.to contain_file('/tmp/certs/CA_wubba.pem').with(
:ensure => 'present', :ensure => 'present',
:content => 'ca_wubba', :content => 'ca_wubba',
:mode => '0600' :mode => '0644'
) )
is_expected.to contain_file('/tmp/certs/CA_lubba.pem').with( is_expected.to contain_file('/tmp/certs/CA_lubba.pem').with(
:ensure => 'present', :ensure => 'present',
:content => 'ca_lubba', :content => 'ca_lubba',
:mode => '0600' :mode => '0644'
) )
end end
end end