diff --git a/devstack/upgrade/resources.sh b/devstack/upgrade/resources.sh
index 52c8f5f195..5d75d6d968 100755
--- a/devstack/upgrade/resources.sh
+++ b/devstack/upgrade/resources.sh
@@ -120,17 +120,18 @@ function scenario_1_do_share_with_rules_and_metadata {
     while (( wait_timeout > 0 )) ; do
         current_state=$( manila access-list $MANILA_GRENADE_SHARE_NAME | \
                          grep " $MANILA_GRENADE_ACCESS_TO " | get_field 5 )
-        if [[ $current_state == 'active' ]]; then
-            active='true'
-            break
-        elif [[ $current_state == 'creating' || $current_state == 'new' ]]; then
-            ((wait_timeout-=$MANILA_GRENADE_WAIT_STEP))
-            sleep $MANILA_GRENADE_WAIT_STEP
-        elif [[ $current_state == 'error' ]]; then
-            die $LINENO "Failed to create access rule."
-        else
-            die $LINENO "Should never reach this line."
-        fi
+        case $current_state in
+            active)
+                active='true'
+                break;;
+            creating|new|queued_to_apply|applying)
+                ((wait_timeout-=$MANILA_GRENADE_WAIT_STEP))
+                sleep $MANILA_GRENADE_WAIT_STEP;;
+            error)
+                die $LINENO "Failed to create access rule.";;
+            *)
+                die $LINENO "Should never reach this line.";;
+        esac
     done
     if [[ $active == 'true' ]]; then
         echo "Access rule has been created successfully."
diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings
index 66d37959da..2821e049db 100644
--- a/devstack/upgrade/settings
+++ b/devstack/upgrade/settings
@@ -8,17 +8,17 @@ export TARGET_RUN_SMOKE=False
 export ENABLE_TEMPEST=False
 
 devstack_localrc base enable_service manila m-api m-shr m-sch m-dat
-devstack_localrc base enable_plugin manila git://git.openstack.org/openstack/manila stable/newton
+devstack_localrc base enable_plugin manila git://git.openstack.org/openstack/manila stable/ocata
 devstack_localrc base MANILA_UI_ENABLED=False
 devstack_localrc base OSLO_SERVICE_WORKS=True
 
 # NOTE(vponomaryov): stable client is used for keeping scenarios stable
 # so they are not broken by changed CLI view.
-devstack_localrc base MANILACLIENT_BRANCH="stable/newton"
+devstack_localrc base MANILACLIENT_BRANCH="stable/ocata"
 
 devstack_localrc target enable_service manila m-api m-shr m-sch m-dat
 devstack_localrc target enable_plugin manila git://git.openstack.org/openstack/manila
 devstack_localrc target MANILA_UI_ENABLED=False
 devstack_localrc target OSLO_SERVICE_WORKS=True
 devstack_localrc target MANILA_USE_DOWNGRADE_MIGRATIONS=False
-devstack_localrc target MANILACLIENT_BRANCH="stable/newton"
+devstack_localrc target MANILACLIENT_BRANCH="stable/ocata"