diff --git a/manifests/database/sql.pp b/manifests/database/sql.pp index d99a8875..d16a1e1d 100644 --- a/manifests/database/sql.pp +++ b/manifests/database/sql.pp @@ -242,9 +242,13 @@ class cloud::database::sql ( 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': - command => '/usr/bin/pkill -F /var/run/xinetd.pid --signal HUP', - refreshonly => true, + command => '/usr/bin/pkill -F /var/run/xinetd.pid --signal HUP', + refreshonly => true, } diff --git a/spec/classes/cloud_database_sql_spec.rb b/spec/classes/cloud_database_sql_spec.rb index e70bad56..8dd28f4f 100644 --- a/spec/classes/cloud_database_sql_spec.rb +++ b/spec/classes/cloud_database_sql_spec.rb @@ -82,7 +82,7 @@ describe 'cloud::database::sql' do it { should contain_file_line('mysqlchk-in-etc-services').with( :line => 'mysqlchk 9200/tcp', :path => '/etc/services', - :notify => 'Service[xinetd]' + :notify => ['Service[xinetd]', 'Exec[reload_xinetd]'] )} it { should contain_file('/etc/xinetd.d/mysqlchk').with_mode('0755') } diff --git a/spec/classes/cloud_image_spec.rb b/spec/classes/cloud_image_spec.rb index 486ec54c..4134691a 100644 --- a/spec/classes/cloud_image_spec.rb +++ b/spec/classes/cloud_image_spec.rb @@ -78,7 +78,7 @@ describe 'cloud::image' do it 'configure glance rbd backend' do should contain_class('glance::backend::rbd').with( - :rbd_store_pool => 'ceph_glance', + :rbd_store_pool => 'images', :rbd_store_user => 'glance' ) end