aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Blanc <pblanc@redhat.com>2015-11-05 14:36:18 -0500
committerPierre Blanc <pblanc@redhat.com>2015-11-09 14:32:07 -0500
commit43ca24ead2d06426ef5657812e1ca3307b755e26 (patch)
tree5b63f18e27337767fb84676be76ec3f1400f6572
parent74c22572c770459802d93b47c17414e4507413e1 (diff)
Fix the wrong selinux context when glance uses nfs backend
We updated the pacemaker resource configuration of fs-varlibglanceimages-clone to mount nfs directory with a specified context. Details on : https://bugzilla.redhat.com/show_bug.cgi?id=1237150 Change-Id: Ia0dd471858f470ae3e82d25151ebe65b8cdbec4f
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index adb52188..5cadc6dd 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -526,11 +526,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 => '',
}
}