Browse Source

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
(cherry picked from commit c7ec7262761d0a09287e9934fe36e3a068415807)
changes/70/747370/2
Giulio Fidente 2 months ago
parent
commit
2406ffc4cc
8 changed files with 8 additions and 7 deletions
  1. +1
    -1
      deployment/cinder/cinder-backend-netapp-puppet.yaml
  2. +1
    -1
      deployment/cinder/cinder-backup-container-puppet.yaml
  3. +1
    -1
      deployment/cinder/cinder-volume-container-puppet.yaml
  4. +1
    -1
      environments/cinder-netapp-config.yaml
  5. +1
    -1
      environments/storage-environment.yaml
  6. +1
    -1
      environments/storage/cinder-netapp-config.yaml
  7. +1
    -1
      environments/storage/cinder-nfs.yaml
  8. +1
    -0
      sample-env-generator/storage.yaml

+ 1
- 1
deployment/cinder/cinder-backend-netapp-puppet.yaml View File

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


+ 1
- 1
deployment/cinder/cinder-backup-container-puppet.yaml View File

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


+ 1
- 1
deployment/cinder/cinder-volume-container-puppet.yaml View File

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


+ 1
- 1
environments/cinder-netapp-config.yaml View File

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


+ 1
- 1
environments/storage-environment.yaml View File

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



+ 1
- 1
environments/storage/cinder-netapp-config.yaml View File

@@ -44,7 +44,7 @@ parameter_defaults:

#
# Type: string
CinderNetappNfsMountOptions: ''
CinderNetappNfsMountOptions: context=system_u:object_r:container_file_t:s0

#
# Type: string


+ 1
- 1
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.
# 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


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

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


Loading…
Cancel
Save