Skip to content
This repository was archived by the owner on Dec 4, 2018. It is now read-only.

Improve Netapp configuration (bnc#892539) #226

Merged
dirkmueller merged 1 commit into from
Jan 27, 2015
Merged

Improve Netapp configuration (bnc#892539) #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crowbar_framework/app/helpers/barclamp/cinder_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def netapp_storage_family(selected)
options_for_select(
[
["Data ONTAP in 7-Mode", "ontap_7mode"],
["Data ONTAP in Clustered Mode", "ontap_cluster"]
["Clustered Data ONTAP", "ontap_cluster"]
],
selected.to_s
)
Expand Down
21 changes: 17 additions & 4 deletions crowbar_framework/app/views/barclamp/cinder/_edit_attributes.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,34 @@
%legend
= t('.volumes.netapp_parameters')

= select_field %w(volumes {{@index}} netapp storage_family), :collection => :netapp_storage_family
= select_field %w(volumes {{@index}} netapp storage_family), :collection => :netapp_storage_family, "data-showit" => "ontap_7mode;ontap_cluster", "data-showit-target" => "#netapp_7mode_container_{{@index}};#netapp_cmode_container_{{@index}}", "data-showit-direct" => "true"
= select_field %w(volumes {{@index}} netapp storage_protocol), :collection => :netapp_storage_protocol, "data-showit" => "nfs", "data-showit-target" => "#netapp_nfs_container_{{@index}}", "data-showit-direct" => "true"
= string_field %w(volumes {{@index}} netapp netapp_server_hostname)
= select_field %w(volumes {{@index}} netapp netapp_transport_type), :collection => :netapp_transports_for_cinder
= integer_field %w(volumes {{@index}} netapp netapp_server_port)
= string_field %w(volumes {{@index}} netapp netapp_login)
= password_field %w(volumes {{@index}} netapp netapp_password)
= string_field %w(volumes {{@index}} netapp netapp_vfiler)

%div{ :id => "netapp_nfs_container_{{@index}}" }
%div{ :id => "netapp_7mode_container_{{@index}}" }
= string_field %w(volumes {{@index}} netapp netapp_vfiler)
%span.help-block
= t(".volumes.netapp.vfiler_hint")

= string_field %w(volumes {{@index}} netapp netapp_volume_list)
%span.help-block
= t(".volumes.netapp.volume_list_hint")

%div{ :id => "netapp_cmode_container_{{@index}}" }
= string_field %w(volumes {{@index}} netapp vserver)

%span.help-block
= t(".volumes.netapp.vserver_hint")

%div{ :id => "netapp_nfs_container_{{@index}}" }
= text_field %w(volumes {{@index}} netapp nfs_shares), :size => "80x5"

%span.help-block
= t(".volumes.netapp.nfs_shares_config_hint")
= t(".volumes.netapp.nfs_shares_config_hint")

{{/if_eq}}
{{#if_eq backend_driver 'emc'}}
Expand Down
8 changes: 6 additions & 2 deletions crowbar_framework/config/locales/cinder/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ en:
netapp_volume_driver: 'NetApp'
netapp:
nfs_shares_config_hint: 'Format one entry per line in the form hostname:/vol/path optional-nfs-mount-options'
vfiler_hint: 'Only Use this option when utilizing the MultiStore feature on the NetApp storage with iSCSI'
vserver_hint: 'If using the NFS storage protocol, this parameter is mandatory for storage service catalog support'
volume_list_hint: 'Optional comma separated list of NetApp controller volume names'
raw_parameters: 'Raw Devices Parameters'
raw_volume_driver: 'Raw Devices'
rbd_parameters: 'RADOS Parameters'
Expand Down Expand Up @@ -93,11 +96,12 @@ en:
netapp_server_hostname: 'Server host name'
netapp_server_port: 'Server port'
netapp_transport_type: 'Transport Type'
netapp_vfiler: 'The vFiler unit name if using vFiler to host OpenStack volumes'
netapp_volume_list: 'Restrict provisioning on iSCSI to these volumes (netapp_volume_list)'
netapp_vfiler: 'The vFiler unit name for provisioning OpenStack volumes (netapp_vfiler)'
nfs_shares: 'List of Netapp NFS Exports'
storage_family: 'Storage Family Type'
storage_protocol: 'Storage Protocol'
vserver: 'Name of the Virtual Storage Server (Vserver)'
vserver: 'Name of the Virtual Storage Server (netapp_vserver)'
raw:
cinder_raw_method: 'Disk selection method'
volume_name: 'Name of Volume'
Expand Down