Skip to content

Commit

Permalink
Merge "Fix heat config when using keystone v3"
Browse files Browse the repository at this point in the history
  • Loading branch information
Jenkins authored and openstack-gerrit committed Jan 5, 2016
2 parents ff2318e + 44ee7e3 commit e60d52c
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions lib/heat
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,7 @@ function configure_heat {
iniset $HEAT_CONF paste_deploy flavor standalone
iniset $HEAT_CONF clients_heat url "http://$HEAT_API_HOST:$HEAT_API_PORT/v1/%(tenant_id)s"
else
iniset $HEAT_CONF keystone_authtoken identity_uri $KEYSTONE_AUTH_URI
iniset $HEAT_CONF keystone_authtoken admin_user $HEAT_SERVICE_USER
iniset $HEAT_CONF keystone_authtoken admin_password $SERVICE_PASSWORD
iniset $HEAT_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
iniset $HEAT_CONF keystone_authtoken cafile $SSL_BUNDLE_FILE
iniset $HEAT_CONF keystone_authtoken signing_dir $HEAT_AUTH_CACHE_DIR
configure_auth_token_middleware $HEAT_CONF heat $HEAT_AUTH_CACHE_DIR
fi

# If HEAT_DEFERRED_AUTH is unset or explicitly set to trusts, configure
Expand Down

0 comments on commit e60d52c

Please sign in to comment.