From e29fccef3ea335b715d9b9a175d8943ed4ce4fc0 Mon Sep 17 00:00:00 2001
From: Andrey <agrebennikov@mirantis.com>
Date: Wed, 17 Feb 2016 14:54:38 -0800
Subject: [PATCH] Added "nfs_mount_options" value

In case special NFS mount options are necessary,
add same options to nova-compute and cinder-volume configs

Change-Id: Ic1829d1d97adb575c6d10142943aa38e07278696
---
 .../plugin_cinder_netapp/manifests/backend/netapp.pp     | 1 +
 .../modules/plugin_cinder_netapp/manifests/compute.pp    | 7 +++++++
 environment_config.yaml                                  | 9 +++++++++
 3 files changed, 17 insertions(+)

diff --git a/deployment_scripts/puppet/modules/plugin_cinder_netapp/manifests/backend/netapp.pp b/deployment_scripts/puppet/modules/plugin_cinder_netapp/manifests/backend/netapp.pp
index 289520d..9a3b683 100644
--- a/deployment_scripts/puppet/modules/plugin_cinder_netapp/manifests/backend/netapp.pp
+++ b/deployment_scripts/puppet/modules/plugin_cinder_netapp/manifests/backend/netapp.pp
@@ -42,6 +42,7 @@ define plugin_cinder_netapp::backend::netapp (
     thres_avl_size_perc_start    => $::fuel_settings['cinder_netapp']['thres_avl_size_perc_start'],
     thres_avl_size_perc_stop     => $::fuel_settings['cinder_netapp']['thres_avl_size_perc_stop'],
     netapp_copyoffload_tool_path => $::fuel_settings['cinder_netapp']['netapp_copyoffload_tool_path'],
+    nfs_mount_options            => $::fuel_settings['cinder_netapp']['nfs_mount_options'],
   }
 
   $index = $::fuel_settings['cinder_netapp']['nb_share']
diff --git a/deployment_scripts/puppet/modules/plugin_cinder_netapp/manifests/compute.pp b/deployment_scripts/puppet/modules/plugin_cinder_netapp/manifests/compute.pp
index 9a86f6b..dc8cd48 100644
--- a/deployment_scripts/puppet/modules/plugin_cinder_netapp/manifests/compute.pp
+++ b/deployment_scripts/puppet/modules/plugin_cinder_netapp/manifests/compute.pp
@@ -27,4 +27,11 @@ class plugin_cinder_netapp::compute {
       fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} currently only supports osfamily RedHat and Debian")
     }
   }
+
+  if $::fuel_settings['cinder_netapp']['nfs_mount_options'] {
+    nova_config {
+      'DEFAULT/nfs_mount_options': value => $::fuel_settings['cinder_netapp']['nfs_mount_options'];
+    }
+  }
+
 }
diff --git a/environment_config.yaml b/environment_config.yaml
index 5b63298..0d56446 100644
--- a/environment_config.yaml
+++ b/environment_config.yaml
@@ -171,6 +171,15 @@ attributes:
     restrictions:
       - condition: "settings:cinder_netapp.netapp_storage_protocol.value != 'nfs'"
         action: "hide"
+  nfs_mount_options:
+    value: ''
+    label: 'NFS mount options'
+    description: '(Optional) Will be used when mouning shares on the Storage and Compute nodes'
+    weight: 79
+    type: "text"
+    restrictions:
+      - condition: "settings:cinder_netapp.netapp_storage_protocol.value != 'nfs'"
+        action: "hide"
 
 # Ontap Cluster
   netapp_vserver: