Browse code
Merge "Remove keystone_ec2_uri flag from lib/heat"
Jenkins authored on 2014/04/14 21:18:07Showing 1 changed files
| ... | ... |
@@ -119,7 +119,6 @@ function configure_heat {
|
| 119 | 119 |
|
| 120 | 120 |
# ec2authtoken |
| 121 | 121 |
iniset $HEAT_CONF ec2authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0 |
| 122 |
- iniset $HEAT_CONF ec2authtoken keystone_ec2_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0/ec2tokens |
|
| 123 | 122 |
|
| 124 | 123 |
# paste_deploy |
| 125 | 124 |
[[ "$HEAT_STANDALONE" = "True" ]] && iniset $HEAT_CONF paste_deploy flavor standalone |