diff --git a/packstack/puppet/templates/keystone.pp b/packstack/puppet/templates/keystone.pp
index 61fbcbba4..9195e2d72 100644
--- a/packstack/puppet/templates/keystone.pp
+++ b/packstack/puppet/templates/keystone.pp
@@ -9,12 +9,6 @@ class {"keystone::roles::admin":
     admin_tenant => "admin"
 }
 
-class {"openstack::auth_file":
-    admin_password => "%(CONFIG_KEYSTONE_ADMINPASSWD)s",
-    admin_tenant => "admin",
-    keystone_admin_token => "%(CONFIG_KEYSTONE_ADMINTOKEN)s"
-}
-
 class {"keystone::endpoint":
     public_address  => "%(CONFIG_KEYSTONE_HOST)s",
     admin_address  => "%(CONFIG_KEYSTONE_HOST)s",
diff --git a/packstack/puppet/templates/openstack_client.pp b/packstack/puppet/templates/openstack_client.pp
index fbb5f5591..2e0ade96c 100644
--- a/packstack/puppet/templates/openstack_client.pp
+++ b/packstack/puppet/templates/openstack_client.pp
@@ -9,10 +9,11 @@ package {"clientlibs":
 
 file {"/root/keystonerc_admin":
    ensure  => "present",
+   mode => '0600',
    content => "export OS_USERNAME=admin
 export OS_TENANT_NAME=admin
 export OS_PASSWORD=%(CONFIG_KEYSTONE_ADMINPASSWD)s
 export OS_AUTH_URL=http://%(CONFIG_KEYSTONE_HOST)s:35357/v2.0/
 export PS1=\"[\\u@\\h \\W(keystone_admin)]\$ \"
-"
+",
 }