diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-12-07 09:29:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-12-07 09:29:57 +0000 |
| commit | 4d59bbb55eae146d78c44282151d3d15eeded240 (patch) | |
| tree | 885a3ac95993f2210af5a58e18c34501e007f96f /puppet | |
| parent | 5a6907f2b829f34daa5f2d9d9cd69de35a1b9c56 (diff) | |
| parent | 43ca24ead2d06426ef5657812e1ca3307b755e26 (diff) | |
Merge "Fix the wrong selinux context when glance uses nfs backend"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 1a66c5ea..8459f1a3 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -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 => '', } } |