Cinder/NetApp plug-in enhancements for multiple NFS shares:

- Support multiple shares on the same NetApp back-end using different IPv4 addresses. - Remove NFS share IPv4 address (now specified in the share itself). Closes-Bug: 1664218 Change-Id: I2d6e086feca5105ca4ed936e56a20e27be260603
2017-02-13 14:51:49 +01:00 · 2017-02-13 14:51:49 +01:00 · 71290940d8
parent 0068efd59c
commit 71290940d8
4 changed files with 28 additions and 65 deletions
--- a/deployment_scripts/puppet/modules/plugin_cinder_netapp/lib/puppet/parser/functions/get_nfs_shares.rb
+++ b/deployment_scripts/puppet/modules/plugin_cinder_netapp/lib/puppet/parser/functions/get_nfs_shares.rb
@ -3,10 +3,9 @@ module Puppet::Parser::Functions
    data = args[0]
    backend_number = args[1]
    nb_share = data['nb_share' + backend_number.to_s].to_i
-    ip = data['nfs_server_ip' + backend_number.to_s]
    shares = ''
    nb_share.downto(1) { |share|
-      shares += ip + ':' + data['nfs_server_share' + backend_number.to_s + share.to_s] + "\n"
+      shares += data['nfs_server_share' + backend_number.to_s + share.to_s] + "\n"
    }
    return shares
  end
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@ -54,9 +54,9 @@ author = u'Mirantis Inc.'
 # built documents.
 #
 # The short X.Y version.
-version = '6.0'
+version = '7.0'
 # The full version, including alpha/beta/rc tags.
-release = '6.0-6.0.0-1'
+release = '7.0-7.0.0-1'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
--- a/environment_config.yaml
+++ b/environment_config.yaml
@ -186,18 +186,6 @@ attributes:
        action: 'hide'

 # NFS Shares
-  nfs_server_ip1:
-    value: ''
-    label: '1st NetApp Backend CDOT Data LIF IP address'
-    description: 'The Data LIF IP address is part of the NFS export location (e.g. If the export is 10.10.10.10:/cinder_flexvol, this value will be 10.10.10.10)'
-    weight: 141
-    type: 'text'
-    regex:
-      source: '\S'
-      error: "This field cannot be empty"
-    restrictions:
-      - condition: "settings:cinder_netapp.netapp_storage_family1.value == 'solidfire' or settings:cinder_netapp.number_netapp_backends.value != '1' and settings:cinder_netapp.number_netapp_backends.value != '2' and settings:cinder_netapp.number_netapp_backends.value != '3' or settings:cinder_netapp.netapp_storage_protocol1.value != 'nfs'"
-        action: 'hide'
  nb_share1:
    type: 'select'
    weight: 142
@ -218,8 +206,8 @@ attributes:
        action: 'hide'
  nfs_server_share11:
    value: ''
-    label: 'CDOT FlexVol volume junction path'
-    description: 'The junction path is part of the NFS export location and specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. If the export is 10.10.10.10:/cinder_flexvol, this value will be /cinder_flexvol)'
+    label: 'CDOT FlexVol volume path 1'
+    description: 'Specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. 10.10.10.10:/cinder_flexvol)'
    weight: 143
    type: 'text'
    regex:
@ -230,8 +218,8 @@ attributes:
        action: 'hide'
  nfs_server_share12:
    value: ''
-    label: 'CDOT FlexVol volume junction path 2'
-    description: 'The junction path is part of the NFS export location and specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. If the export is 10.10.10.10:/cinder_flexvol_2, this value will be /cinder_flexvol_2)'
+    label: 'CDOT FlexVol volume path 2'
+    description: 'Specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. 10.10.10.10:/cinder_flexvol_2)'
    weight: 144
    type: 'text'
    restrictions:
@ -239,8 +227,8 @@ attributes:
        action: 'hide'
  nfs_server_share13:
    value: ''
-    label: 'CDOT FlexVol volume junction path 3'
-    description: 'The junction path is part of the NFS export location and specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. If the export is 10.10.10.10:/cinder_flexvol_3, this value will be /cinder_flexvol_3)'
+    label: 'CDOT FlexVol volume path 3'
+    description: 'Specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. 10.10.10.10:/cinder_flexvol_3)'
    weight: 145
    type: 'text'
    restrictions:
@ -248,8 +236,8 @@ attributes:
        action: "hide"
  nfs_server_share14:
    value: ''
-    label: 'CDOT FlexVol volume junction path 4'
-    description: 'The junction path is part of the NFS export location and specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. If the export is 10.10.10.10:/cinder_flexvol_4, this value will be /cinder_flexvol_4)'
+    label: 'CDOT FlexVol volume path 4'
+    description: 'Specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. 10.10.10.10:/cinder_flexvol_4)'
    weight: 146
    type: 'text'
    restrictions:
@ -536,18 +524,6 @@ attributes:
        action: 'hide'

 # NFS Shares
-  nfs_server_ip2:
-    value: ''
-    label: '2nd NetApp Backend CDOT Data LIF IP address'
-    description: 'The Data LIF IP address is part of the NFS export location (e.g. If the export is 10.10.10.10:/cinder_flexvol, this value will be 10.10.10.10)'
-    weight: 241
-    type: 'text'
-    regex:
-      source: '\S'
-      error: "This field cannot be empty"
-    restrictions:
-      - condition: "settings:cinder_netapp.netapp_storage_family2.value == 'solidfire' or settings:cinder_netapp.number_netapp_backends.value != '2' and settings:cinder_netapp.number_netapp_backends.value != '3' or settings:cinder_netapp.netapp_storage_protocol2.value != 'nfs'"
-        action: 'hide'
  nb_share2:
    type: 'select'
    weight: 242
@ -568,8 +544,8 @@ attributes:
        action: 'hide'
  nfs_server_share21:
    value: ''
-    label: 'CDOT FlexVol volume junction path'
-    description: 'The junction path is part of the NFS export location and specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. If the export is 10.10.10.10:/cinder_flexvol, this value will be /cinder_flexvol)'
+    label: 'CDOT FlexVol volume path'
+    description: 'Specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. 10.10.10.10:/cinder_flexvol)'
    weight: 243
    type: 'text'
    regex:
@ -580,8 +556,8 @@ attributes:
        action: 'hide'
  nfs_server_share22:
    value: ''
-    label: 'CDOT FlexVol volume junction path 2'
-    description: 'The junction path is part of the NFS export location and specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. If the export is 10.10.10.10:/cinder_flexvol_2, this value will be /cinder_flexvol_2)'
+    label: 'CDOT FlexVol volume path 2'
+    description: 'Specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. 10.10.10.10:/cinder_flexvol_2)'
    weight: 244
    type: 'text'
    restrictions:
@ -589,8 +565,8 @@ attributes:
        action: 'hide'
  nfs_server_share23:
    value: ''
-    label: 'CDOT FlexVol volume junction path 3'
-    description: 'The junction path is part of the NFS export location and specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. If the export is 10.10.10.10:/cinder_flexvol_3, this value will be /cinder_flexvol_3)'
+    label: 'CDOT FlexVol volume path 3'
+    description: 'Specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. 10.10.10.10:/cinder_flexvol_3)'
    weight: 245
    type: 'text'
    restrictions:
@ -598,8 +574,8 @@ attributes:
        action: "hide"
  nfs_server_share24:
    value: ''
-    label: 'CDOT FlexVol volume junction path 4'
-    description: 'The junction path is part of the NFS export location and specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. If the export is 10.10.10.10:/cinder_flexvol_4, this value will be /cinder_flexvol_4)'
+    label: 'CDOT FlexVol volume path 4'
+    description: 'Specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. 10.10.10.10:/cinder_flexvol_4)'
    weight: 246
    type: 'text'
    restrictions:
@ -886,18 +862,6 @@ attributes:
        action: 'hide'

 # NFS Shares
-  nfs_server_ip3:
-    value: ''
-    label: '3rd NetApp Backend CDOT Data LIF IP address'
-    description: 'The Data LIF IP address is part of the NFS export location (e.g. If the export is 10.10.10.10:/cinder_flexvol, this value will be 10.10.10.10)'
-    weight: 341
-    type: 'text'
-    regex:
-      source: '\S'
-      error: "This field cannot be empty"
-    restrictions:
-      - condition: "settings:cinder_netapp.netapp_storage_family3.value == 'solidfire' or settings:cinder_netapp.number_netapp_backends.value != '3' or settings:cinder_netapp.netapp_storage_protocol3.value != 'nfs'"
-        action: 'hide'
  nb_share3:
    type: 'select'
    weight: 342
@ -918,8 +882,8 @@ attributes:
        action: 'hide'
  nfs_server_share31:
    value: ''
-    label: 'CDOT FlexVol volume junction path'
-    description: 'The junction path is part of the NFS export location and specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. If the export is 10.10.10.10:/cinder_flexvol, this value will be /cinder_flexvol)'
+    label: 'CDOT FlexVol volume path'
+    description: 'Specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. 10.10.10.10:/cinder_flexvol)'
    weight: 343
    type: 'text'
    regex:
@ -930,8 +894,8 @@ attributes:
        action: 'hide'
  nfs_server_share32:
    value: ''
-    label: 'CDOT FlexVol volume junction path 2'
-    description: 'The junction path is part of the NFS export location and specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. If the export is 10.10.10.10:/cinder_flexvol_2, this value will be /cinder_flexvol_2)'
+    label: 'CDOT FlexVol volume path 2'
+    description: 'Specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. 10.10.10.10:/cinder_flexvol_2)'
    weight: 344
    type: 'text'
    restrictions:
@ -939,8 +903,8 @@ attributes:
        action: 'hide'
  nfs_server_share33:
    value: ''
-    label: 'CDOT FlexVol volume junction path 3'
-    description: 'The junction path is part of the NFS export location and specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. If the export is 10.10.10.10:/cinder_flexvol_3, this value will be /cinder_flexvol_3)'
+    label: 'CDOT FlexVol volume path 3'
+    description: 'Specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. 10.10.10.10:/cinder_flexvol_3)'
    weight: 345
    type: 'text'
    restrictions:
@ -948,8 +912,8 @@ attributes:
        action: "hide"
  nfs_server_share34:
    value: ''
-    label: 'CDOT FlexVol volume junction path 4'
-    description: 'The junction path is part of the NFS export location and specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. If the export is 10.10.10.10:/cinder_flexvol_4, this value will be /cinder_flexvol_4)'
+    label: 'CDOT FlexVol volume path 4'
+    description: 'Specifies the path for the FlexVol volume in which Cinder volumes should be placed (e.g. 10.10.10.10:/cinder_flexvol_4)'
    weight: 346
    type: 'text'
    restrictions:
--- a/metadata.yaml
+++ b/metadata.yaml
@ -3,7 +3,7 @@ name: cinder_netapp
 # Human-readable name for your plugin
 title: Cinder and NetApp integration
 # Plugin version
-version: '6.0.0'
+version: '6.0.3'
 # Description
 description: Enables using NetApp as a Cinder backend
 # Required fuel version