commit 0c4d1e339801bb9d346dfa5a29af2ab76517bbd7
Author: Felipe Rodrigues <felipefuty01@gmail.com>
Date:   Thu Sep 24 12:22:20 2020 +0000

    [NetApp] Fix access rules for CIFS promoted replica
    
    This patch fixes the access rules for NetApp promote replica when
    using CIFS protocol. When promoting a replica, the NetApp ONTAP
    driver updates the access rules for the promoted CIFS share entity
    before actually creating it, failing on having those rules
    applied.
    
    The bug is fixed by switching the order of updating the access
    and creating the promoted CIFS share entity.
    
    Change-Id: I60e4057dc962d96cff57dea88587a28c2043b499
    Closes-Bug: #1896949

diff --git a/manila/share/drivers/netapp/dataontap/cluster_mode/lib_base.py b/manila/share/drivers/netapp/dataontap/cluster_mode/lib_base.py
index f2d0336..7f7073d 100644
--- a/manila/share/drivers/netapp/dataontap/cluster_mode/lib_base.py
+++ b/manila/share/drivers/netapp/dataontap/cluster_mode/lib_base.py
@@ -2148,6 +2148,9 @@ class NetAppCmodeFileStorageLibrary(object):
 
         # 3. Setup access rules
         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.set_client(vserver_client)
         try:
@@ -2158,8 +2161,6 @@ class NetAppCmodeFileStorageLibrary(object):
         else:
             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
 
         # 4. Set File system size fixed to false
diff --git a/releasenotes/notes/1896949-netapp-fix-cifs-access-rules-promoted-replica-70b32991cc90e1ca.yaml b/releasenotes/notes/1896949-netapp-fix-cifs-access-rules-promoted-replica-70b32991cc90e1ca.yaml
new file mode 100644
index 0000000..e82abb9
--- /dev/null
+++ b/releasenotes/notes/1896949-netapp-fix-cifs-access-rules-promoted-replica-70b32991cc90e1ca.yaml
@@ -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.