openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix the wrong selinux context when glance uses nfs backend"

This commit is contained in:
Jenkins 2015-12-07 09:29:57 +00:00 committed by Gerrit Code Review
parent 5a6907f2b8 43ca24ead2
commit 4d59bbb55e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -534,11 +534,12 @@ if hiera('step') >= 3 {
$glance_store = concat($http_store, $backend_store)
if $glance_backend == 'file' and hiera('glance_file_pcmk_manage', false) {
$secontext = 'context="system_u:object_r:glance_var_lib_t:s0"'
pacemaker::resource::filesystem { 'glance-fs':
device => hiera('glance_file_pcmk_device'),
directory => hiera('glance_file_pcmk_directory'),
fstype => hiera('glance_file_pcmk_fstype'),
fsoptions => hiera('glance_file_pcmk_options', ''),
fsoptions => join([$secontext, hiera('glance_file_pcmk_options', '')],','),
clone_params => '',
}
}