Skip to content

Commit 8eabb44

Browse files
bschonecjst-cyr
authored andcommitted
(acceptance-tests-pr-1695) Add purge and recurse options to the include directory creation when MariaDB package.
Co-authored-by: Brian Schonecker <bschonec@gmail.com>
1 parent 76cf3b2 commit 8eabb44

2 files changed

Lines changed: 23 additions & 5 deletions

File tree

manifests/server/config.pp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,10 @@
8686
if $includedir == undef or $includedir == '' or
8787
($configparentdir != $includedir and $configparentdir != dirname($includedir)) {
8888
file { $configparentdir:
89-
ensure => directory,
90-
mode => '0755',
89+
ensure => directory,
90+
mode => '0755',
91+
recurse => $mysql::server::purge_conf_dir,
92+
purge => $mysql::server::purge_conf_dir,
9193
}
9294
}
9395
}

spec/classes/mycnf_template_spec.rb

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,25 @@
7979
context 'with includedir' do
8080
let(:params) { { includedir: '/etc/my.cnf.d' } }
8181

82-
it 'makes the directory' do
83-
expect(subject).to contain_file('/etc/my.cnf.d').with(ensure: :directory,
84-
mode: '0755')
82+
context 'when purge_conf_dir is false' do
83+
let(:params) { super().merge({ 'purge_conf_dir' => false }) }
84+
85+
it 'makes the directory without recursion' do
86+
expect(subject).to contain_file('/etc/my.cnf.d').with(ensure: :directory,
87+
mode: '0755',
88+
recurse: false,
89+
purge: false)
90+
end
91+
end
92+
93+
context 'when purge_conf_dir is true' do
94+
let(:params) { super().merge({ 'purge_conf_dir' => true }) }
95+
96+
it 'makes the directory with purge and recursion' do
97+
expect(subject).to contain_file('/etc/my.cnf.d').with(ensure: :directory,
98+
recurse: true,
99+
purge: true)
100+
end
85101
end
86102

87103
it { is_expected.to contain_file('mysql-config-file').with_content(%r{!includedir}) }

0 commit comments

Comments
 (0)