openstack
/
cookbook-openstack-orchestration
Code Issues Proposed changes

Use the library method auth_uri_transform. 

Change-Id: I260ac1603a77ffe0390a5bd40aa98491f7e94f41
Imlements: blueprint move-keystone-authtoken-move-auth-uri-logic
This commit is contained in:
ericzhou 2014-03-14 23:54:40 +08:00
parent a619d75301
commit a2933a98f9
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -75,6 +75,7 @@ Attributes for the Heat service are in the ['openstack']['orchestration'] namesp
* `openstack['orchestration']['rpc_conn_pool_size']` - size of RPC connection pool
* `openstack['orchestration']['rpc_response_timeout']` - seconds to wait for a response from call or multicall
* `openstack['orchestration']['platform']` - hash of platform specific package/service names and options
* `openstack['orchestration']['api']['auth']['version']` - Select v2.0 or v3.0. Default v2.0. The auth API version used to interact with identity service.
MQ attributes
-------------

2
attributes/default.rb
View File

@ -40,7 +40,7 @@ default['openstack']['orchestration']['service_tenant_name'] = 'service'
default['openstack']['orchestration']['service_user'] = 'heat'
default['openstack']['orchestration']['service_role'] = 'admin'
default['openstack']['orchestration']['api']['auth']['version'] = 'v2.0'
default['openstack']['orchestration']['api']['auth']['version'] = node['openstack']['api']['auth']['version']
# If set, heat API service will bind to the address on this interface,
# otherwise it will bind to the API endpoint's host.

12
recipes/common.rb
View File

@ -59,17 +59,7 @@ heat_api_cloudwatch_endpoint = endpoint 'orchestration-api-cloudwatch'
service_pass = get_password 'service', 'openstack-orchestration'
# TODO(jaypipes): Move this logic and stuff into the openstack-common
# library cookbook.
auth_uri = identity_endpoint.to_s
if node['openstack']['orchestration']['api']['auth']['version'] != 'v2.0'
# The auth_uri should contain /v2.0 in most cases, but if the
# auth_version is v3.0, we leave it off. This is only necessary
# for environments that need to support V3 non-default-domain
# tokens, which is really the only reason to set version to
# something other than v2.0 (the default)
auth_uri = auth_uri.gsub('/v2.0', '')
end
auth_uri = auth_uri_transform identity_endpoint.to_s, node['openstack']['orchestration']['api']['auth']['version']
mq_service_type = node['openstack']['mq']['orchestration']['service_type']