openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Use container_file_t for Cinder*NfsMountOptions by default" into stable/train

This commit is contained in:
Zuul 2020-09-03 04:04:19 +00:00 committed by Gerrit Code Review
parent 66c014e13e b34ca4e1c0
commit 6c93aa63ba
8 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/cinder/cinder-backend-netapp-puppet.yaml
View File

@ -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: ''

2
deployment/cinder/cinder-backup-container-puppet.yaml
View File

@ -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

2
deployment/cinder/cinder-volume-container-puppet.yaml
View File

@ -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.

2
environments/cinder-netapp-config.yaml
View File

@ -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: ''

2
environments/storage-environment.yaml
View File

@ -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: ''

2
environments/storage/cinder-netapp-config.yaml
View File

@ -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

2
environments/storage/cinder-nfs.yaml
View File

@ -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

1
sample-env-generator/storage.yaml
View File

@ -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