parent
6fa538c4af
commit
6fff20c08c
@ -242,9 +242,13 @@ class cloud::database::sql (
|
|||||||
group => 'root';
|
group => 'root';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Hack for Debian. The puppet-xinetd module do not correctly reload
|
||||||
|
# the configuration on “notify”
|
||||||
|
# TODO(Gonéri): remove this once https://github.com/puppetlabs/puppetlabs-xinetd/pull/9
|
||||||
|
# get merged
|
||||||
exec{ 'reload_xinetd':
|
exec{ 'reload_xinetd':
|
||||||
command => '/usr/bin/pkill -F /var/run/xinetd.pid --signal HUP',
|
command => '/usr/bin/pkill -F /var/run/xinetd.pid --signal HUP',
|
||||||
refreshonly => true,
|
refreshonly => true,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -82,7 +82,7 @@ describe 'cloud::database::sql' do
|
|||||||
it { should contain_file_line('mysqlchk-in-etc-services').with(
|
it { should contain_file_line('mysqlchk-in-etc-services').with(
|
||||||
:line => 'mysqlchk 9200/tcp',
|
:line => 'mysqlchk 9200/tcp',
|
||||||
:path => '/etc/services',
|
:path => '/etc/services',
|
||||||
:notify => 'Service[xinetd]'
|
:notify => ['Service[xinetd]', 'Exec[reload_xinetd]']
|
||||||
)}
|
)}
|
||||||
|
|
||||||
it { should contain_file('/etc/xinetd.d/mysqlchk').with_mode('0755') }
|
it { should contain_file('/etc/xinetd.d/mysqlchk').with_mode('0755') }
|
||||||
|
@ -78,7 +78,7 @@ describe 'cloud::image' do
|
|||||||
|
|
||||||
it 'configure glance rbd backend' do
|
it 'configure glance rbd backend' do
|
||||||
should contain_class('glance::backend::rbd').with(
|
should contain_class('glance::backend::rbd').with(
|
||||||
:rbd_store_pool => 'ceph_glance',
|
:rbd_store_pool => 'images',
|
||||||
:rbd_store_user => 'glance'
|
:rbd_store_user => 'glance'
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user