diff --git a/deployment/cinder/cinder-backend-netapp-puppet.yaml b/deployment/cinder/cinder-backend-netapp-puppet.yaml index 23c79f740b..a00acd00b6 100644 --- a/deployment/cinder/cinder-backend-netapp-puppet.yaml +++ b/deployment/cinder/cinder-backend-netapp-puppet.yaml @@ -83,7 +83,7 @@ parameters: default: '/etc/cinder/shares.conf' CinderNetappNfsMountOptions: type: string - default: '' + default: 'context=system_u:object_r:container_file_t:s0' CinderNetappCopyOffloadToolPath: type: string default: '' diff --git a/deployment/cinder/cinder-backup-container-puppet.yaml b/deployment/cinder/cinder-backup-container-puppet.yaml index 3bbcd2404b..6d5a6f58cb 100644 --- a/deployment/cinder/cinder-backup-container-puppet.yaml +++ b/deployment/cinder/cinder-backup-container-puppet.yaml @@ -79,7 +79,7 @@ parameters: description: NFS share to be mounted type: string CinderBackupNfsMountOptions: - default: '' + default: 'context=system_u:object_r:container_file_t:s0' description: Mount options passed to the NFS client. See NFS man page for details. type: string diff --git a/deployment/cinder/cinder-volume-container-puppet.yaml b/deployment/cinder/cinder-volume-container-puppet.yaml index 06531d0398..ddd1fb23d6 100644 --- a/deployment/cinder/cinder-volume-container-puppet.yaml +++ b/deployment/cinder/cinder-volume-container-puppet.yaml @@ -99,7 +99,7 @@ parameters: When set, it overrides the default CinderStorageAvailabilityZone. type: string CinderNfsMountOptions: - default: '' + default: 'context=system_u:object_r:container_file_t:s0' description: > Mount options for NFS mounts used by Cinder NFS backend. Effective when CinderEnableNfsBackend is true. diff --git a/environments/cinder-netapp-config.yaml b/environments/cinder-netapp-config.yaml index d2ebfce2eb..8c540baafd 100644 --- a/environments/cinder-netapp-config.yaml +++ b/environments/cinder-netapp-config.yaml @@ -20,7 +20,7 @@ parameter_defaults: CinderNetappPartnerBackendName: '' CinderNetappNfsShares: '' CinderNetappNfsSharesConfig: '/etc/cinder/shares.conf' - CinderNetappNfsMountOptions: '' + CinderNetappNfsMountOptions: 'context=system_u:object_r:container_file_t:s0' CinderNetappCopyOffloadToolPath: '' CinderNetappControllerIps: '' CinderNetappSaPassword: '' diff --git a/environments/storage-environment.yaml b/environments/storage-environment.yaml index 523a091cb4..eab7b8c3a5 100644 --- a/environments/storage-environment.yaml +++ b/environments/storage-environment.yaml @@ -34,7 +34,7 @@ parameter_defaults: #### CINDER NFS SETTINGS #### ## 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' # CinderNfsServers: '' diff --git a/environments/storage/cinder-netapp-config.yaml b/environments/storage/cinder-netapp-config.yaml index ce84e3bb78..4cbf9539bc 100644 --- a/environments/storage/cinder-netapp-config.yaml +++ b/environments/storage/cinder-netapp-config.yaml @@ -44,7 +44,7 @@ parameter_defaults: # # Type: string - CinderNetappNfsMountOptions: '' + CinderNetappNfsMountOptions: context=system_u:object_r:container_file_t:s0 # # Type: string diff --git a/environments/storage/cinder-nfs.yaml b/environments/storage/cinder-nfs.yaml index 2de3e78c2c..8c51c3cbfc 100644 --- a/environments/storage/cinder-nfs.yaml +++ b/environments/storage/cinder-nfs.yaml @@ -19,7 +19,7 @@ parameter_defaults: # Mount options for NFS mounts used by Cinder NFS backend. Effective when CinderEnableNfsBackend is true. # 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. # Type: comma_delimited_list diff --git a/sample-env-generator/storage.yaml b/sample-env-generator/storage.yaml index e04eaf456a..f1e597a1ff 100644 --- a/sample-env-generator/storage.yaml +++ b/sample-env-generator/storage.yaml @@ -12,6 +12,7 @@ environments: sample_values: CinderEnableNfsBackend: True CinderEnableIscsiBackend: False + CinderNfsMountOption: 'context=system_u:object_r:container_file_t:s0' CinderNfsServers: '192.168.122.1:/export/cinder' description: | Configure and include this environment to enable the use of an NFS