diff --git a/packstack/puppet/modules/packstack/manifests/openstackclient.pp b/packstack/puppet/modules/packstack/manifests/openstackclient.pp
index e9e3a8e4d..c27dabab5 100644
--- a/packstack/puppet/modules/packstack/manifests/openstackclient.pp
+++ b/packstack/puppet/modules/packstack/manifests/openstackclient.pp
@@ -27,6 +27,7 @@ class packstack::openstackclient ()
     $rcadmin_common_content = "unset OS_SERVICE_TOKEN
     export OS_USERNAME=${ost_cl_keystone_admin_username}
     export OS_PASSWORD='${ost_cl_keystone_admin_pw}'
+    export OS_REGION_NAME=${ost_cl_keystone_region}
     export OS_AUTH_URL=${ost_cl_ctrl_keystone_url}
     export PS1='[\\u@\\h \\W(keystone_admin)]\\$ '
     "
@@ -34,7 +35,6 @@ class packstack::openstackclient ()
     if $int_api_version < 3 {
       $rcadmin_content = "${rcadmin_common_content}
 export OS_TENANT_NAME=admin
-export OS_REGION_NAME=${ost_cl_keystone_region}
     "
     }
     else {