openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix selinux context for glance-api"

Browse Source
This commit is contained in:
Zuul 2019-09-24 00:18:03 +00:00 committed by Gerrit Code Review
commit 018ff067f3
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/glance/glance-api-container-puppet.yaml
View File

@ -110,7 +110,7 @@ parameters:
Netapp share to mount for image storage (when GlanceNetappNfsEnabled is true)
type: string
GlanceNfsOptions:
default: '_netdev,bg,intr,context=system_u:object_r:glance_var_lib_t:s0'
default: '_netdev,bg,intr,context=system_u:object_r:svirt_sandbox_file_t:s0'
description: >
NFS mount options for image storage (when GlanceNfsEnabled is true)
type: string
@ -164,7 +164,7 @@ parameters:
URI that specifies the staging location to use when importing images
type: string
GlanceStagingNfsOptions:
default: '_netdev,bg,intr,context=system_u:object_r:glance_var_lib_t:s0'
default: '_netdev,bg,intr,context=system_u:object_r:svirt_sandbox_file_t:s0'
description: >
NFS mount options for NFS image import staging
type: string
@ -514,7 +514,7 @@ outputs:
- /var/lib/kolla/config_files/glance_api.json:/var/lib/kolla/config_files/config.json
- /var/lib/config-data/puppet-generated/glance_api/:/var/lib/kolla/config_files/src:ro
- /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
- /var/lib/glance:/var/lib/glance:slave,z
- /var/lib/glance:/var/lib/glance:slave
-
if:
- cinder_backend_enabled

2
environments/storage-environment.yaml
View File

@ -49,7 +49,7 @@ parameter_defaults:
## e.g. "'[fdd0::1]:/export/glance'")
# GlanceNfsShare: ''
## Mount options for the NFS image storage mount point
# GlanceNfsOptions: 'intr,context=system_u:object_r:glance_var_lib_t:s0'
# GlanceNfsOptions: 'intr,context=system_u:object_r:svirt_sandbox_file_t:s0'
#### NOVA NFS SETTINGS ####

4
environments/storage/glance-nfs.yaml
View File

@ -19,7 +19,7 @@ parameter_defaults:
# NFS mount options for image storage (when GlanceNfsEnabled is true)
# Type: string
GlanceNfsOptions: _netdev,bg,intr,context=system_u:object_r:glance_var_lib_t:s0
GlanceNfsOptions: _netdev,bg,intr,context=system_u:object_r:svirt_sandbox_file_t:s0
# NFS share to mount for image storage (when GlanceNfsEnabled is true)
# Type: string
@ -31,7 +31,7 @@ parameter_defaults:
# NFS mount options for NFS image import staging
# Type: string
GlanceStagingNfsOptions: _netdev,bg,intr,context=system_u:object_r:glance_var_lib_t:s0
GlanceStagingNfsOptions: _netdev,bg,intr,context=system_u:object_r:svirt_sandbox_file_t:s0
# NFS share to mount for image import staging
# Type: string