From 162434e0ac9e0c7e40420deb2840a3ca872d9c00 Mon Sep 17 00:00:00 2001 From: Vitaliy Levitski Date: Wed, 18 Jan 2017 14:51:52 +0200 Subject: [PATCH] Add MapRFS protocol Add native protocol for MapRFS Manila share driver Implements: blueprint maprfs-native-protocol Change-Id: I6fe89e295aa0ebc693c25abcda40e19dcd1e4317 --- manila_ui/dashboards/admin/shares/forms.py | 2 +- manila_ui/dashboards/project/shares/shares/forms.py | 2 +- manila_ui/local/local_settings.d/_90_manila_shares.py | 3 ++- releasenotes/notes/add-maprfs-protocol-5d7f4b4c47da8fab.yaml | 3 +++ 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/add-maprfs-protocol-5d7f4b4c47da8fab.yaml diff --git a/manila_ui/dashboards/admin/shares/forms.py b/manila_ui/dashboards/admin/shares/forms.py index 5252acd3..36734337 100644 --- a/manila_ui/dashboards/admin/shares/forms.py +++ b/manila_ui/dashboards/admin/shares/forms.py @@ -233,7 +233,7 @@ class ManageShare(forms.SelfHandlingForm): manila_features = getattr(settings, 'OPENSTACK_MANILA_FEATURES', {}) self.enabled_share_protocols = manila_features.get( 'enabled_share_protocols', - ['NFS', 'CIFS', 'GlusterFS', 'HDFS', 'CephFS']) + ['NFS', 'CIFS', 'GlusterFS', 'HDFS', 'CephFS', 'MapRFS']) self.fields['protocol'].choices = ([(' ', ' ')] + [(enabled_proto, enabled_proto) for enabled_proto in diff --git a/manila_ui/dashboards/project/shares/shares/forms.py b/manila_ui/dashboards/project/shares/shares/forms.py index 1be37555..cf8b847e 100644 --- a/manila_ui/dashboards/project/shares/shares/forms.py +++ b/manila_ui/dashboards/project/shares/shares/forms.py @@ -53,7 +53,7 @@ class CreateForm(forms.SelfHandlingForm): manila_features = getattr(settings, 'OPENSTACK_MANILA_FEATURES', {}) self.enabled_share_protocols = manila_features.get( 'enabled_share_protocols', - ['NFS', 'CIFS', 'GlusterFS', 'HDFS', 'CephFS']) + ['NFS', 'CIFS', 'GlusterFS', 'HDFS', 'CephFS', 'MapRFS']) self.enable_public_shares = manila_features.get( 'enable_public_shares', True) share_networks = manila.share_network_list(request) diff --git a/manila_ui/local/local_settings.d/_90_manila_shares.py b/manila_ui/local/local_settings.d/_90_manila_shares.py index 75d9cb39..8e187f0a 100644 --- a/manila_ui/local/local_settings.d/_90_manila_shares.py +++ b/manila_ui/local/local_settings.d/_90_manila_shares.py @@ -19,5 +19,6 @@ OPENSTACK_MANILA_FEATURES = { 'enable_migration': True, 'enable_public_share_type_creation': True, 'enable_public_shares': True, - 'enabled_share_protocols': ['NFS', 'CIFS', 'GlusterFS', 'HDFS', 'CephFS'], + 'enabled_share_protocols': ['NFS', 'CIFS', 'GlusterFS', 'HDFS', 'CephFS', + 'MapRFS'], } diff --git a/releasenotes/notes/add-maprfs-protocol-5d7f4b4c47da8fab.yaml b/releasenotes/notes/add-maprfs-protocol-5d7f4b4c47da8fab.yaml new file mode 100644 index 00000000..e742a2f5 --- /dev/null +++ b/releasenotes/notes/add-maprfs-protocol-5d7f4b4c47da8fab.yaml @@ -0,0 +1,3 @@ +--- +features: + - Added native protocol for MapRFS manila share driver