heat-keystone-setup error: Found existing heat user

[Feng Ju]

After this patch (https://review.openstack.org/#/c/61905/2) merged, there is an issue when heat-keystone-setup try to find and create heat user.

[root@rhel62 ~]# heat-keystone-setup
Using the OS_PASSWORD for the SERVICE_PASSWORD.
Endpoints will be registered as localhost, but this usually won't work.
Set SERVICE_HOST to a publically accessible hostname/IP instead.
ADMIN_ROLE 8c2682f77b5a4855a59d1dbfc27a0e89
SERVICE_TENANT 86ffd69e6ad844e7bf4f54139d0819b5
SERVICE_PASSWORD openstack1
SERVICE_TOKEN ADMIN
SERVICE_HOST localhost
[ERROR] /usr/bin/heat-keystone-setup:107 Fail to get_data from 'keystone user-list'
Found existing heat user
HEAT_USERID [Call Trace] /usr/bin/heat-keystone-setup:315:keystone_setup /usr/bin/heat-keystone-setup:293:get_user /usr/bin/heat-keystone-setup:129:get_data /usr/bin/heat-keystone-setup:107:die_if_not_set /usr/bin/heat-keystone-setup:84:die
[Call Trace]
/usr/bin/heat-keystone-setup:315:keystone_setup
/usr/bin/heat-keystone-setup:296:add_role
/usr/bin/heat-keystone-setup:157:die_if_not_set
/usr/bin/heat-keystone-setup:84:die
[ERROR] /usr/bin/heat-keystone-setup:157 Fail to get user_roles for tenant(Trace]) and user_id([Call)

this bug is caused by die_if_not_set check after keystone user-list if there is no heat user exist.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/65238

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/65238
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=02f3d7023537742ab98d361ebc495876d824db20
Submitter: Jenkins
Branch: master

commit 02f3d7023537742ab98d361ebc495876d824db20
Author: jufeng <email address hidden>
Date: Tue Jan 7 16:01:09 2014 +0800

    Fix heat-keystone-setup error when try to create heat user

    Unset OS_SERVICE_TOKEN and OS_SERVICE_ENDPOINT temporarily to make
    sure this command can run even if the OS_SERVICE_TOKEN and
    OS_SERVICE_ENDPOIN exist in shell environment.
    Remove die_if_not_set in get_data function, because there maybe no
    data in get_data function, for example, if the heat user does not
    exist, the die_if_not_set will be in error.
    Remove die_if_not_set after keystone user-list for the same reason.

    Change-Id: I132f975ac2da21e6ad7431ae326ad9bd538e4696
    Closes-Bug: #1266670