Skip to content

[WIP] fixes for manila share encryption #370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
skook1 wants to merge 1 commit into
base: stable/2025.1-m3
Choose a base branch
from
+6 −5
Open

[WIP] fixes for manila share encryption #370

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
4 changes: 2 additions & 2 deletions manila/keymgr/barbican.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ def get_client_and_href(self, context, secret_ref):
# session of barbican user to get its user_id. Grant ACL to barbican
# user that it will be used for the key_ref handover process.
try:
user_barbican_client, base_url = self._get_barbican_client(context)
secret_ref = self._create_secret_ref(base_url, secret_ref)
user_barbican_client = self._get_barbican_client(context)
secret_ref = self._create_secret_ref(secret_ref)
except Exception as e:
LOG.error("Failed to create barbican client. Error: %s", e)
raise exception.ManilaBarbicanACLError()
Expand Down
6 changes: 3 additions & 3 deletions manila/share/drivers/netapp/dataontap/cluster_mode/lib_multi_svm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1123,9 +1123,9 @@ def _check_reuse_share_server(self, share_server, nfs_config, share=None,
'configured for the existing share_servers')
if (encryption_key_ref and encryption_key_ref !=
share_server['encryption_key_ref']):
msg = _('The available share server %(server_id)s is already'
'configured with a different encryption-key-ref',
{'server_id': share_server['id']})
msg = _('The available share server %(server_id)s is already '
'configured with a different encryption-key-ref') % {
'server_id': share_server['id']}
LOG.warning(msg)
return False

Expand Down
1 change: 1 addition & 0 deletions manila/share/drivers/netapp/dataontap/protocols/cifs_cmode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ def update_access(self, share, share_name, rules, replica=False):
_, cifs_share_name = self._get_export_location(share)
existing_rules = self._get_access_rules(share, cifs_share_name)


# Update rules in an order that will prevent transient disruptions
self._handle_added_rules(cifs_share_name, existing_rules, new_rules)
self._handle_ro_to_rw_rules(cifs_share_name, existing_rules, new_rules)
Expand Down