Merge "Remove old workaround to fix wrong owner of nova-manage.log"
This commit is contained in:
commit
cdcfe1e087
@ -127,16 +127,6 @@ class nova::logging(
|
|||||||
include nova::deps
|
include nova::deps
|
||||||
include nova::params
|
include nova::params
|
||||||
|
|
||||||
if !is_service_default($log_dir) {
|
|
||||||
# This should force an update the selinux role if the logfile exists.
|
|
||||||
# It will be incorrect if the file was created by the dbsync exec resources.
|
|
||||||
file { "${log_dir}/nova-manage.log":
|
|
||||||
owner => $::nova::params::user,
|
|
||||||
group => $::nova::params::group,
|
|
||||||
require => Anchor['nova::service::end']
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
oslo::log { 'nova_config':
|
oslo::log { 'nova_config':
|
||||||
debug => $debug,
|
debug => $debug,
|
||||||
use_stderr => $use_stderr,
|
use_stderr => $use_stderr,
|
||||||
|
@ -69,9 +69,6 @@ describe 'nova::logging' do
|
|||||||
:watch_log_file => '<SERVICE DEFAULT>',
|
:watch_log_file => '<SERVICE DEFAULT>',
|
||||||
:debug => '<SERVICE DEFAULT>',
|
:debug => '<SERVICE DEFAULT>',
|
||||||
)
|
)
|
||||||
is_expected.to contain_file('/var/log/nova/nova-manage.log').with(
|
|
||||||
:owner => 'nova',
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -88,9 +85,6 @@ describe 'nova::logging' do
|
|||||||
:watch_log_file => true,
|
:watch_log_file => true,
|
||||||
:debug => true,
|
:debug => true,
|
||||||
)
|
)
|
||||||
is_expected.to contain_file('/var/log/foo/nova-manage.log').with(
|
|
||||||
:owner => 'nova',
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -113,9 +107,6 @@ describe 'nova::logging' do
|
|||||||
:instance_uuid_format => '[instance: %(uuid)s] ',
|
:instance_uuid_format => '[instance: %(uuid)s] ',
|
||||||
:log_date_format => '%Y-%m-%d %H:%M:%S',
|
:log_date_format => '%Y-%m-%d %H:%M:%S',
|
||||||
)
|
)
|
||||||
is_expected.to contain_file('/var/log/foo/nova-manage.log').with(
|
|
||||||
:owner => 'nova',
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user