openstack/devstack
Code Issues Proposed changes

Fix Heat's signing_dir

Browse Source 
This is not critical but looks odd using api-cfn.

Change-Id: Ie0f5c66f635b4a7c6ba51581ad01bab624158e61
This commit is contained in:
Angus Salkeld 2013-09-06 13:35:09 +10:00
parent 69f745748d
commit e118655028
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/heat
View File

@ -100,7 +100,7 @@ function configure_heat() {
iniset $HEAT_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME iniset $HEAT_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
iniset $HEAT_CONF keystone_authtoken admin_user heat iniset $HEAT_CONF keystone_authtoken admin_user heat
iniset $HEAT_CONF keystone_authtoken admin_password $SERVICE_PASSWORD iniset $HEAT_CONF keystone_authtoken admin_password $SERVICE_PASSWORD
iniset $HEAT_CONF keystone_authtoken signing_dir $HEAT_AUTH_CACHE_DIR/api-cfn iniset $HEAT_CONF keystone_authtoken signing_dir $HEAT_AUTH_CACHE_DIR
# ec2authtoken # ec2authtoken
iniset $HEAT_CONF ec2authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0 iniset $HEAT_CONF ec2authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0
@ -148,12 +148,8 @@ function init_heat() {
# create_heat_cache_dir() - Part of the init_heat() process # create_heat_cache_dir() - Part of the init_heat() process
function create_heat_cache_dir() { function create_heat_cache_dir() {
# Create cache dirs # Create cache dirs
sudo mkdir -p $HEAT_AUTH_CACHE_DIR/api sudo mkdir -p $HEAT_AUTH_CACHE_DIR
sudo chown $STACK_USER $HEAT_AUTH_CACHE_DIR/api sudo chown $STACK_USER $HEAT_AUTH_CACHE_DIR
sudo mkdir -p $HEAT_AUTH_CACHE_DIR/api-cfn
sudo chown $STACK_USER $HEAT_AUTH_CACHE_DIR/api-cfn
sudo mkdir -p $HEAT_AUTH_CACHE_DIR/api-cloudwatch
sudo chown $STACK_USER $HEAT_AUTH_CACHE_DIR/api-cloudwatch
} }
# install_heatclient() - Collect source and prepare # install_heatclient() - Collect source and prepare