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.

diff --git a/bin/heat-keystone-setup b/bin/heat-keystone-setup
index b241442d6eeb81c9491759f04e0c4bc62aa61ff8..166233a044feb963cc085d027a79fa31ca07d142 100755 (executable)
--- 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 74739e8a528a54a2467a4b0d913353fd0cbda602..e16a71bf4a18d7ef05bfad7c559799a53cf67620 100644 (file)
--- 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 414769e47cc85612ee6c219edd105afc52562175..067e323b35fcfb2a4101f66c39329d3860b18229 100644 (file)
--- 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.