Rename CloudFormation service to heat-cfn

This is consistent with what is implemented in devstack.

Change-Id: If47c28ddbef1d6c61e2d741f359d850e4ecffaa9
Signed-off-by: Zane Bitter <zbitter@redhat.com>

diff --git a/bin/heat-keystone-setup b/bin/heat-keystone-setup
index 166233a044feb963cc085d027a79fa31ca07d142..53e55cf6e3b8cca065eaccf7c7bc66082d9f5c16 100755 (executable)
--- a/bin/heat-keystone-setup
+++ b/bin/heat-keystone-setup
@@ -37,7 +37,7 @@ echo SERVICE_TOKEN $SERVICE_TOKEN
 
 # Services
 HEAT_SERVICE=$(get_id \
-keystone service-create --name=heat \
+keystone service-create --name=heat-cfn \
                         --type=cloudformation \
                         --description="Heat Service")
 HEAT_USER=$(get_id keystone user-create --name=heat \

diff --git a/heat/engine/auth.py b/heat/engine/auth.py
index 616ed18f3fd537bcf1e22d9c13ca78015dcec2d0..b422dbe1cf1d597acf8dd3ec5dee78ee615ab177 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='cloudformation', service_name='heat'):
+def authenticate(con, service_type='cloudformation', service_name='heat-cfn'):
     """ Authenticate a user context.  This authenticates either an
         EC2 style key context or a keystone user/pass context.