x/packstack
Code Issues Proposed changes

Change permissions of keystonerc_admin to 0600

Browse Source 
Also no longer creating openrc, we don't need it if we have
keystonerc_admin
https://bugzilla.redhat.com/show_bug.cgi?id=890354

Change-Id: Ifb0aa1a4d63cf077bb0a4bed076cfc068b1e2dfe
This commit is contained in:
Derek Higgins
2013-01-15 19:27:20 -05:00
parent 91e2c422e4
commit c38b1b13d3
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packstack/puppet/templates/keystone.pp
View File

@@ -9,12 +9,6 @@ class {"keystone::roles::admin":
admin_tenant => "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": class {"keystone::endpoint":
public_address => "%(CONFIG_KEYSTONE_HOST)s", public_address => "%(CONFIG_KEYSTONE_HOST)s",
admin_address => "%(CONFIG_KEYSTONE_HOST)s", admin_address => "%(CONFIG_KEYSTONE_HOST)s",

3
packstack/puppet/templates/openstack_client.pp
View File

@@ -9,10 +9,11 @@ package {"clientlibs":
file {"/root/keystonerc_admin": file {"/root/keystonerc_admin":
ensure => "present", ensure => "present",
mode => '0600',
content => "export OS_USERNAME=admin content => "export OS_USERNAME=admin
export OS_TENANT_NAME=admin export OS_TENANT_NAME=admin
export OS_PASSWORD=%(CONFIG_KEYSTONE_ADMINPASSWD)s export OS_PASSWORD=%(CONFIG_KEYSTONE_ADMINPASSWD)s
export OS_AUTH_URL=http://%(CONFIG_KEYSTONE_HOST)s:35357/v2.0/ export OS_AUTH_URL=http://%(CONFIG_KEYSTONE_HOST)s:35357/v2.0/
export PS1=\"[\\u@\\h \\W(keystone_admin)]\$ \" export PS1=\"[\\u@\\h \\W(keystone_admin)]\$ \"
" ",
} }