Use container_file_t for Cinder*NfsMountOptions by default
This is so that share content is usable by cinder-volume and other containers mounting the same share. Closes-Bug: 1890291 Change-Id: Iacf7c9c368b26106e9921b35996c134aacb9acd7
This commit is contained in:
parent
b9722e1ac4
commit
c7ec726276
|
@ -83,7 +83,7 @@ parameters:
|
||||||
default: '/etc/cinder/shares.conf'
|
default: '/etc/cinder/shares.conf'
|
||||||
CinderNetappNfsMountOptions:
|
CinderNetappNfsMountOptions:
|
||||||
type: string
|
type: string
|
||||||
default: ''
|
default: 'context=system_u:object_r:container_file_t:s0'
|
||||||
CinderNetappCopyOffloadToolPath:
|
CinderNetappCopyOffloadToolPath:
|
||||||
type: string
|
type: string
|
||||||
default: ''
|
default: ''
|
||||||
|
|
|
@ -79,7 +79,7 @@ parameters:
|
||||||
description: NFS share to be mounted
|
description: NFS share to be mounted
|
||||||
type: string
|
type: string
|
||||||
CinderBackupNfsMountOptions:
|
CinderBackupNfsMountOptions:
|
||||||
default: ''
|
default: 'context=system_u:object_r:container_file_t:s0'
|
||||||
description: Mount options passed to the NFS client. See NFS man
|
description: Mount options passed to the NFS client. See NFS man
|
||||||
page for details.
|
page for details.
|
||||||
type: string
|
type: string
|
||||||
|
|
|
@ -99,7 +99,7 @@ parameters:
|
||||||
When set, it overrides the default CinderStorageAvailabilityZone.
|
When set, it overrides the default CinderStorageAvailabilityZone.
|
||||||
type: string
|
type: string
|
||||||
CinderNfsMountOptions:
|
CinderNfsMountOptions:
|
||||||
default: ''
|
default: 'context=system_u:object_r:container_file_t:s0'
|
||||||
description: >
|
description: >
|
||||||
Mount options for NFS mounts used by Cinder NFS backend. Effective
|
Mount options for NFS mounts used by Cinder NFS backend. Effective
|
||||||
when CinderEnableNfsBackend is true.
|
when CinderEnableNfsBackend is true.
|
||||||
|
|
|
@ -20,7 +20,7 @@ parameter_defaults:
|
||||||
CinderNetappPartnerBackendName: ''
|
CinderNetappPartnerBackendName: ''
|
||||||
CinderNetappNfsShares: ''
|
CinderNetappNfsShares: ''
|
||||||
CinderNetappNfsSharesConfig: '/etc/cinder/shares.conf'
|
CinderNetappNfsSharesConfig: '/etc/cinder/shares.conf'
|
||||||
CinderNetappNfsMountOptions: ''
|
CinderNetappNfsMountOptions: 'context=system_u:object_r:container_file_t:s0'
|
||||||
CinderNetappCopyOffloadToolPath: ''
|
CinderNetappCopyOffloadToolPath: ''
|
||||||
CinderNetappControllerIps: ''
|
CinderNetappControllerIps: ''
|
||||||
CinderNetappSaPassword: ''
|
CinderNetappSaPassword: ''
|
||||||
|
|
|
@ -34,7 +34,7 @@ parameter_defaults:
|
||||||
#### CINDER NFS SETTINGS ####
|
#### CINDER NFS SETTINGS ####
|
||||||
|
|
||||||
## NFS mount options
|
## NFS mount options
|
||||||
# CinderNfsMountOptions: ''
|
# CinderNfsMountOptions: 'context=system_u:object_r:container_file_t:s0'
|
||||||
## NFS mount point, e.g. '192.168.122.1:/export/cinder'
|
## NFS mount point, e.g. '192.168.122.1:/export/cinder'
|
||||||
# CinderNfsServers: ''
|
# CinderNfsServers: ''
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@ parameter_defaults:
|
||||||
|
|
||||||
#
|
#
|
||||||
# Type: string
|
# Type: string
|
||||||
CinderNetappNfsMountOptions: ''
|
CinderNetappNfsMountOptions: context=system_u:object_r:container_file_t:s0
|
||||||
|
|
||||||
#
|
#
|
||||||
# Type: string
|
# Type: string
|
||||||
|
|
|
@ -19,7 +19,7 @@ parameter_defaults:
|
||||||
|
|
||||||
# Mount options for NFS mounts used by Cinder NFS backend. Effective when CinderEnableNfsBackend is true.
|
# Mount options for NFS mounts used by Cinder NFS backend. Effective when CinderEnableNfsBackend is true.
|
||||||
# Type: string
|
# Type: string
|
||||||
CinderNfsMountOptions: ''
|
CinderNfsMountOptions: context=system_u:object_r:container_file_t:s0
|
||||||
|
|
||||||
# NFS servers used by Cinder NFS backend. Effective when CinderEnableNfsBackend is true.
|
# NFS servers used by Cinder NFS backend. Effective when CinderEnableNfsBackend is true.
|
||||||
# Type: comma_delimited_list
|
# Type: comma_delimited_list
|
||||||
|
|
|
@ -12,6 +12,7 @@ environments:
|
||||||
sample_values:
|
sample_values:
|
||||||
CinderEnableNfsBackend: True
|
CinderEnableNfsBackend: True
|
||||||
CinderEnableIscsiBackend: False
|
CinderEnableIscsiBackend: False
|
||||||
|
CinderNfsMountOption: 'context=system_u:object_r:container_file_t:s0'
|
||||||
CinderNfsServers: '192.168.122.1:/export/cinder'
|
CinderNfsServers: '192.168.122.1:/export/cinder'
|
||||||
description: |
|
description: |
|
||||||
Configure and include this environment to enable the use of an NFS
|
Configure and include this environment to enable the use of an NFS
|
||||||
|
|
Loading…
Reference in New Issue