From a34b9ef5ab0aa3590fd28cb9f8088a3e0896947f Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Wed, 10 Oct 2012 13:21:47 +1300 Subject: [PATCH] Change endpoint service type from orchestration to cloudformation. This is required so that the REST API can take over the orchestration service type. This will break exiting setups until heat-keystone-setup is re-run. There will be a corresponding update to devstack, which may be out of sync to this one. --- bin/heat-keystone-setup | 2 +- heat/client.py | 2 +- heat/engine/auth.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/heat-keystone-setup b/bin/heat-keystone-setup index b241442d..166233a0 100755 --- a/bin/heat-keystone-setup +++ b/bin/heat-keystone-setup @@ -38,7 +38,7 @@ echo SERVICE_TOKEN $SERVICE_TOKEN # Services HEAT_SERVICE=$(get_id \ keystone service-create --name=heat \ - --type=orchestration \ + --type=cloudformation \ --description="Heat Service") HEAT_USER=$(get_id keystone user-create --name=heat \ --pass="$SERVICE_PASSWORD" \ diff --git a/heat/client.py b/heat/client.py index 74739e8a..e16a71bf 100644 --- a/heat/client.py +++ b/heat/client.py @@ -180,4 +180,4 @@ def get_client(host, port=None, username=None, auth_tok=auth_token, creds=creds, insecure=insecure, - service_type='orchestration') + service_type='cloudformation') diff --git a/heat/engine/auth.py b/heat/engine/auth.py index 414769e4..067e323b 100644 --- a/heat/engine/auth.py +++ b/heat/engine/auth.py @@ -61,7 +61,7 @@ def decrypt(auth_info): return res -def authenticate(con, service_type='orchestration', service_name='heat'): +def authenticate(con, service_type='cloudformation', service_name='heat'): """ Authenticate a user context. This authenticates either an EC2 style key context or a keystone user/pass context. -- 2.45.2