Merge "Switch to keystone service_type=orchestration."

heat/common/auth.py

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

heat/engine/auth.py

@@ -61,7 +61,7 @@ def decrypt(auth_info):
     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
         EC2 style key context or a keystone user/pass context.
 

tools/heat-keystone-service

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

tools/heat-keystone-service-devstack

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