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
This commit is contained in:
Andrey 2016-02-17 14:54:38 -08:00
parent 6007131331
commit db6582dafc
3 changed files with 17 additions and 0 deletions

View File

@ -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_start => $::fuel_settings['cinder_netapp']['thres_avl_size_perc_start'],
thres_avl_size_perc_stop => $::fuel_settings['cinder_netapp']['thres_avl_size_perc_stop'], 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'], 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'] $index = $::fuel_settings['cinder_netapp']['nb_share']

View File

@ -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") 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']";
}
}
} }

View File

@ -171,6 +171,15 @@ attributes:
restrictions: restrictions:
- condition: "settings:cinder_netapp.netapp_storage_protocol.value != 'nfs'" - condition: "settings:cinder_netapp.netapp_storage_protocol.value != 'nfs'"
action: "hide" 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: 78
type: "text"
restrictions:
- condition: "settings:cinder_netapp.netapp_storage_protocol.value != 'nfs'"
action: "hide"
# Ontap Cluster # Ontap Cluster
netapp_vserver: netapp_vserver: