diff --git a/packstack/puppet/modules/packstack/manifests/openstackclient.pp b/packstack/puppet/modules/packstack/manifests/openstackclient.pp
index d9805e427..b91d40f37 100644
--- a/packstack/puppet/modules/packstack/manifests/openstackclient.pp
+++ b/packstack/puppet/modules/packstack/manifests/openstackclient.pp
@@ -25,17 +25,17 @@ 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)]\\$ '
-    "
+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)]\\$ '
+"
 
     if $int_api_version < 3 {
       $rcadmin_content = "${rcadmin_common_content}
 export OS_TENANT_NAME=admin
-    "
+"
     }
     else {
         $rcadmin_content = "${rcadmin_common_content}
@@ -43,7 +43,7 @@ export OS_PROJECT_NAME=admin
 export OS_USER_DOMAIN_NAME=Default
 export OS_PROJECT_DOMAIN_NAME=Default
 export OS_IDENTITY_API_VERSION=${int_api_version}
-    "
+"
     }
 
     file { "${::home_dir}/keystonerc_admin":
@@ -58,20 +58,20 @@ export OS_USERNAME=demo
 export OS_PASSWORD='${ost_cl_keystone_demo_pw}'
 export PS1='[\\u@\\h \\W(keystone_demo)]\\$ '
 export OS_AUTH_URL=${ost_cl_ctrl_keystone_url}
-    "
+"
 
       if $int_api_version < 3 {
         $demo_content = "${demo_common_content}
 export OS_TENANT_NAME=demo
 export OS_IDENTITY_API_VERSION=${int_api_version}.0
-    "
+"
       } else {
         $demo_content = "${demo_common_content}
 export OS_PROJECT_NAME=demo
 export OS_USER_DOMAIN_NAME=Default
 export OS_PROJECT_DOMAIN_NAME=Default
 export OS_IDENTITY_API_VERSION=${int_api_version}
-    "
+"
       }
 
       file { "${::home_dir}/keystonerc_demo":