openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Fix typo in SSL file resource" into stable/wallaby

This commit is contained in:
Zuul 2021-10-12 20:25:56 +00:00 committed by Gerrit Code Review
parent 3f5b1321c6 f1e4c36246
commit c13fd723ca
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,7 +215,7 @@ class tripleo::profile::base::metrics::qdr (
$final_ssl_profiles = $prep_ssl_profiles.reduce( [] ) |$memo, $prf| { $final_ssl_profiles = $prep_ssl_profiles.reduce( [] ) |$memo, $prf| {
if has_key($prf, 'caCertFileContent') { if has_key($prf, 'caCertFileContent') {
file { $prf['caCertFile']: file { $prf['caCertFile']:
ensure => exists, ensure => present,
content => $prf['caCertFileContent'], content => $prf['caCertFileContent'],
mode => '0600', mode => '0600',
require => File[$ssl_cert_dir] require => File[$ssl_cert_dir]

4
spec/classes/tripleo_profile_base_metrics_qdr_spec.rb
View File

@ -210,12 +210,12 @@ describe 'tripleo::profile::base::metrics::qdr' do
:mode => '0700' :mode => '0700'
) )
is_expected.to contain_file('/tmp/certs/CA_wubba.pem').with( is_expected.to contain_file('/tmp/certs/CA_wubba.pem').with(
:ensure => 'exists', :ensure => 'present',
:content => 'ca_wubba', :content => 'ca_wubba',
:mode => '0600' :mode => '0600'
) )
is_expected.to contain_file('/tmp/certs/CA_lubba.pem').with( is_expected.to contain_file('/tmp/certs/CA_lubba.pem').with(
:ensure => 'exists', :ensure => 'present',
:content => 'ca_lubba', :content => 'ca_lubba',
:mode => '0600' :mode => '0600'
) )