openstack/heat
Code Issues Proposed changes

Merge "Switch to keystone service_type=orchestration."

Browse Source
This commit is contained in:
Jenkins 2012-09-07 03:58:50 +00:00 committed by Gerrit Code Review
commit a44519774a
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/common/auth.py
View File

@ -200,7 +200,7 @@ class KeystoneStrategy(BaseStrategy):
logger.warn(msg) logger.warn(msg)
continue continue
if service_type == 'heat': if service_type == 'orchestration':
for ep in service['endpoints']: for ep in service['endpoints']:
if region is None or region == ep['region']: if region is None or region == ep['region']:
if endpoint is not None: if endpoint is not None:

2
heat/engine/auth.py
View File

@ -61,7 +61,7 @@ def decrypt(auth_info):
return res return res
def authenticate(con, service_type='heat', service_name='heat'): def authenticate(con, service_type='orchestration', service_name='heat'):
""" Authenticate a user context. This authenticates either an """ Authenticate a user context. This authenticates either an
EC2 style key context or a keystone user/pass context. EC2 style key context or a keystone user/pass context.

2
tools/heat-keystone-service
View File

@ -39,7 +39,7 @@ echo SERVICE_TOKEN $SERVICE_TOKEN
# Services # Services
HEAT_SERVICE=$(get_id \ HEAT_SERVICE=$(get_id \
keystone service-create --name=heat \ keystone service-create --name=heat \
--type=heat \ --type=orchestration \
--description="Heat Service") --description="Heat Service")
HEAT_USER=$(get_id keystone user-create --name=heat \ HEAT_USER=$(get_id keystone user-create --name=heat \
--pass="$SERVICE_PASSWORD" \ --pass="$SERVICE_PASSWORD" \

2
tools/heat-keystone-service-devstack
View File

@ -39,7 +39,7 @@ echo SERVICE_TOKEN $SERVICE_TOKEN
# Services # Services
HEAT_SERVICE=$(get_id \ HEAT_SERVICE=$(get_id \
keystone service-create --name=heat \ keystone service-create --name=heat \
--type=heat \ --type=orchestration \
--description="Heat Service") --description="Heat Service")
HEAT_USER=$(get_id keystone user-create --name=heat \ HEAT_USER=$(get_id keystone user-create --name=heat \
--pass="$SERVICE_PASSWORD" \ --pass="$SERVICE_PASSWORD" \