summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-17 20:59:48 +0000
committerGerrit Code Review <review@openstack.org>2017-06-17 20:59:48 +0000
commit106c25b6aaaee80451ca6eabcb0be51adb81815e (patch)
treea31508977b4a856bc3de07f55d0d4bd90844f435
parentab08fd19165e4f1eb837ec17f084ee68385e8a05 (diff)
parent21eb374fa155131081e40bd3ec75c16ef6b454e4 (diff)
Merge "Add support for Cinder "NAS secure" driver params" into stable/ocata
-rw-r--r--puppet/services/cinder-backend-netapp.yaml8
-rw-r--r--puppet/services/cinder-volume.yaml16
-rw-r--r--releasenotes/notes/add-cinder-nas-secure-parameters-53f9d6a6e9bc129b.yaml5
3 files changed, 29 insertions, 0 deletions
diff --git a/puppet/services/cinder-backend-netapp.yaml b/puppet/services/cinder-backend-netapp.yaml
index 29a0ce1..3346bb4 100644
--- a/puppet/services/cinder-backend-netapp.yaml
+++ b/puppet/services/cinder-backend-netapp.yaml
@@ -71,6 +71,12 @@ parameters:
71 CinderNetappWebservicePath: 71 CinderNetappWebservicePath:
72 type: string 72 type: string
73 default: '/devmgr/v2' 73 default: '/devmgr/v2'
74 CinderNetappNasSecureFileOperations:
75 type: string
76 default: 'false'
77 CinderNetappNasSecureFilePermissions:
78 type: string
79 default: 'false'
74 # DEPRECATED options for compatibility with older versions 80 # DEPRECATED options for compatibility with older versions
75 CinderNetappEseriesHostType: 81 CinderNetappEseriesHostType:
76 type: string 82 type: string
@@ -125,5 +131,7 @@ outputs:
125 cinder::backend::netapp::netapp_storage_pools: {get_param: CinderNetappStoragePools} 131 cinder::backend::netapp::netapp_storage_pools: {get_param: CinderNetappStoragePools}
126 cinder::backend::netapp::netapp_host_type: {get_param: CinderNetappHostType} 132 cinder::backend::netapp::netapp_host_type: {get_param: CinderNetappHostType}
127 cinder::backend::netapp::netapp_webservice_path: {get_param: CinderNetappWebservicePath} 133 cinder::backend::netapp::netapp_webservice_path: {get_param: CinderNetappWebservicePath}
134 cinder::backend::netapp::nas_secure_file_operations: {get_param: CinderNetappNasSecureFileOperations}
135 cinder::backend::netapp::nas_secure_file_permissions: {get_param: CinderNetappNasSecureFilePermissions}
128 step_config: | 136 step_config: |
129 include ::tripleo::profile::base::cinder::volume 137 include ::tripleo::profile::base::cinder::volume
diff --git a/puppet/services/cinder-volume.yaml b/puppet/services/cinder-volume.yaml
index 26f1a96..e636430 100644
--- a/puppet/services/cinder-volume.yaml
+++ b/puppet/services/cinder-volume.yaml
@@ -40,6 +40,20 @@ parameters:
40 NFS servers used by Cinder NFS backend. Effective when 40 NFS servers used by Cinder NFS backend. Effective when
41 CinderEnableNfsBackend is true. 41 CinderEnableNfsBackend is true.
42 type: comma_delimited_list 42 type: comma_delimited_list
43 CinderNasSecureFileOperations:
44 default: false
45 description: >
46 Controls whether security enhanced NFS file operations are enabled.
47 Valid values are 'auto', 'true' or 'false'. Effective when
48 CinderEnableNfsBackend is true.
49 type: string
50 CinderNasSecureFilePermissions:
51 default: false
52 description: >
53 Controls whether security enhanced NFS file permissions are enabled.
54 Valid values are 'auto', 'true' or 'false'. Effective when
55 CinderEnableNfsBackend is true.
56 type: string
43 CinderRbdPoolName: 57 CinderRbdPoolName:
44 default: volumes 58 default: volumes
45 type: string 59 type: string
@@ -95,6 +109,8 @@ outputs:
95 tripleo::profile::base::cinder::volume::cinder_enable_rbd_backend: {get_param: CinderEnableRbdBackend} 109 tripleo::profile::base::cinder::volume::cinder_enable_rbd_backend: {get_param: CinderEnableRbdBackend}
96 tripleo::profile::base::cinder::volume::nfs::cinder_nfs_mount_options: {get_param: CinderNfsMountOptions} 110 tripleo::profile::base::cinder::volume::nfs::cinder_nfs_mount_options: {get_param: CinderNfsMountOptions}
97 tripleo::profile::base::cinder::volume::nfs::cinder_nfs_servers: {get_param: CinderNfsServers} 111 tripleo::profile::base::cinder::volume::nfs::cinder_nfs_servers: {get_param: CinderNfsServers}
112 tripleo::profile::base::cinder::volume::nfs::cinder_nas_secure_file_operations: {get_param: CinderNasSecureFileOperations}
113 tripleo::profile::base::cinder::volume::nfs::cinder_nas_secure_file_permissions: {get_param: CinderNasSecureFilePermissions}
98 tripleo::profile::base::cinder::volume::iscsi::cinder_lvm_loop_device_size: {get_param: CinderLVMLoopDeviceSize} 114 tripleo::profile::base::cinder::volume::iscsi::cinder_lvm_loop_device_size: {get_param: CinderLVMLoopDeviceSize}
99 tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_helper: {get_param: CinderISCSIHelper} 115 tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_helper: {get_param: CinderISCSIHelper}
100 tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_protocol: {get_param: CinderISCSIProtocol} 116 tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_protocol: {get_param: CinderISCSIProtocol}
diff --git a/releasenotes/notes/add-cinder-nas-secure-parameters-53f9d6a6e9bc129b.yaml b/releasenotes/notes/add-cinder-nas-secure-parameters-53f9d6a6e9bc129b.yaml
new file mode 100644
index 0000000..73b9f9c
--- /dev/null
+++ b/releasenotes/notes/add-cinder-nas-secure-parameters-53f9d6a6e9bc129b.yaml
@@ -0,0 +1,5 @@
1---
2features:
3 - Add parameters to control the Cinder NAS security settings associated
4 with the NFS and NetApp Cinder back ends. The settings are disabled
5 by default.