Browse code
Merge "Use the oslo db database connection for Heat"
Jenkins authored on 2013/11/16 03:18:04Showing 1 changed files
| ... | ... |
@@ -80,7 +80,7 @@ function configure_heat() {
|
| 80 | 80 |
iniset $HEAT_CONF DEFAULT heat_metadata_server_url http://$HEAT_API_CFN_HOST:$HEAT_API_CFN_PORT |
| 81 | 81 |
iniset $HEAT_CONF DEFAULT heat_waitcondition_server_url http://$HEAT_API_CFN_HOST:$HEAT_API_CFN_PORT/v1/waitcondition |
| 82 | 82 |
iniset $HEAT_CONF DEFAULT heat_watch_server_url http://$HEAT_API_CW_HOST:$HEAT_API_CW_PORT |
| 83 |
- iniset $HEAT_CONF DEFAULT sql_connection `database_connection_url heat` |
|
| 83 |
+ iniset $HEAT_CONF database connection `database_connection_url heat` |
|
| 84 | 84 |
iniset $HEAT_CONF DEFAULT auth_encryption_key `hexdump -n 16 -v -e '/1 "%02x"' /dev/random` |
| 85 | 85 |
|
| 86 | 86 |
# logging |