From: Zane Bitter <zbitter@redhat.com>
Date: Wed, 17 Oct 2012 08:33:45 +0000 (+0200)
Subject: Rename CloudFormation service to heat-cfn
X-Git-Tag: 2014.1~1296
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=bae47db46091c7ee2840abb264818731ed4ae099;p=openstack-build%2Fheat-build.git

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 166233a0..53e55cf6 100755
--- 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 616ed18f..b422dbe1 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='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.