Merge "netapp backend should have ability to set nas_secure_file_operations and nas_secure_file_permissions."
diff --git a/README.rst b/README.rst
index e9eb4cf..99a4ffe 100644
--- a/README.rst
+++ b/README.rst
@@ -366,6 +366,8 @@
transport_type: https
lun_space_reservation: enabled
use_multipath_for_image_xfer: True
+ nas_secure_file_operations: false
+ nas_secure_file_permissions: false
devices:
- 172.18.1.2:/vol_1
- 172.18.1.2:/vol_2
diff --git a/cinder/files/backend/_netapp.conf b/cinder/files/backend/_netapp.conf
index f755b43..5555cf6 100644
--- a/cinder/files/backend/_netapp.conf
+++ b/cinder/files/backend/_netapp.conf
@@ -30,3 +30,9 @@
netapp_lun_space_reservation={{ backend.get('lun_space_reservation', 'disabled') }}
use_multipath_for_image_xfer={{ backend.get('use_multipath_for_image_xfer', False) }}
netapp_copyoffload_tool_path={{ backend.get('copyoffload_tool_path', '') }}
+{%- if backend.nas_secure_file_permissions is defined %}
+nas_secure_file_permissions={{ backend.nas_secure_file_permissions }}
+{%- endif %}
+{%- if backend.nas_secure_file_operations is defined %}
+nas_secure_file_operations={{ backend.nas_secure_file_operations }}
+{%- endif %}
diff --git a/tests/pillar/netapp.sls b/tests/pillar/netapp.sls
index 5390d66..f48845b 100644
--- a/tests/pillar/netapp.sls
+++ b/tests/pillar/netapp.sls
@@ -21,6 +21,8 @@
transport_type: https
netapp_lun_space_reservation: enabled
use_multipath_for_image_xfer: True
+ nas_secure_file_operations: false
+ nas_secure_file_permissions: false
devices:
- 172.18.2.2:/vol_1
- 172.18.2.2:/vol_2