Merge "[NetApp] Fix access rules for CIFS promoted replica" into stable/train

This commit is contained in:
Zuul 2021-06-02 18:47:54 +00:00 committed by Gerrit Code Review
commit 28e21d6371
2 changed files with 10 additions and 2 deletions

View File

@ -1823,6 +1823,9 @@ class NetAppCmodeFileStorageLibrary(object):
# 3. Setup access rules # 3. Setup access rules
new_active_replica = replica.copy() new_active_replica = replica.copy()
new_active_replica['export_locations'] = self._create_export(
new_active_replica, share_server, vserver, vserver_client)
helper = self._get_helper(replica) helper = self._get_helper(replica)
helper.set_client(vserver_client) helper.set_client(vserver_client)
try: try:
@ -1833,8 +1836,6 @@ class NetAppCmodeFileStorageLibrary(object):
else: else:
new_active_replica['access_rules_status'] = constants.STATUS_ACTIVE new_active_replica['access_rules_status'] = constants.STATUS_ACTIVE
new_active_replica['export_locations'] = self._create_export(
new_active_replica, share_server, vserver, vserver_client)
new_active_replica['replica_state'] = constants.REPLICA_STATE_ACTIVE new_active_replica['replica_state'] = constants.REPLICA_STATE_ACTIVE
# 4. Set File system size fixed to false # 4. Set File system size fixed to false

View File

@ -0,0 +1,7 @@
---
fixes:
- |
Fixed an issue on ONTAP NetApp driver that caused access rules not to be
applied to a promoted replica using CIFS protocol. Please refer to the
`Launchpad bug #1896949 <https://bugs.launchpad.net/manila/+bug/1896949>`_
for more details.