openstack/cookbook-openstack-identity
Code Issues Proposed changes

Merge "fix bootstrap_token to match with the other cookbooks"

Browse Source
This commit is contained in:
Jenkins
2013-05-28 22:06:39 +00:00
committed by Gerrit Code Review
parent d6a6477a0c 80024eb68c
commit 893a45c61b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
recipes/registration.rb
View File

@@ -32,7 +32,7 @@ admin_user = node["openstack"]["identity"]["admin_user"]
admin_pass = user_password node["openstack"]["identity"]["admin_user"] admin_pass = user_password node["openstack"]["identity"]["admin_user"]
auth_uri = ::URI.decode identity_admin_endpoint.to_s auth_uri = ::URI.decode identity_admin_endpoint.to_s
bootstrap_token = secret "secrets", "keystone_bootstrap_token" bootstrap_token = secret "secrets", "openstack_identity_bootstrap_token"
# We need to bootstrap the keystone admin user so that calls # We need to bootstrap the keystone admin user so that calls
# to keystone_register will succeed, since those provider calls # to keystone_register will succeed, since those provider calls

2
recipes/server.rb
View File

@@ -106,7 +106,7 @@ db_user = node["openstack"]["identity"]["db"]["username"]
db_pass = db_password "keystone" db_pass = db_password "keystone"
sql_connection = db_uri("identity", db_user, db_pass) sql_connection = db_uri("identity", db_user, db_pass)
bootstrap_token = secret "secrets", "keystone_bootstrap_token" bootstrap_token = secret "secrets", "openstack_identity_bootstrap_token"
ip_address = node["network"]["ipaddress_#{node["openstack"]["identity"]["bind_interface"]}"] ip_address = node["network"]["ipaddress_#{node["openstack"]["identity"]["bind_interface"]}"]