Browse code
Merge "Stop setting nova.conf settings that mean nothing"
Jenkins authored on 2014/09/28 10:22:33Showing 1 changed files
| ... | ... |
@@ -421,7 +421,6 @@ function create_nova_conf {
|
| 421 | 421 |
iniset $NOVA_CONF DEFAULT scheduler_driver "$SCHEDULER" |
| 422 | 422 |
iniset $NOVA_CONF DEFAULT dhcpbridge_flagfile "$NOVA_CONF" |
| 423 | 423 |
iniset $NOVA_CONF DEFAULT force_dhcp_release "True" |
| 424 |
- iniset $NOVA_CONF DEFAULT fixed_range "" |
|
| 425 | 424 |
iniset $NOVA_CONF DEFAULT default_floating_pool "$PUBLIC_NETWORK_NAME" |
| 426 | 425 |
iniset $NOVA_CONF DEFAULT s3_host "$SERVICE_HOST" |
| 427 | 426 |
iniset $NOVA_CONF DEFAULT s3_port "$S3_SERVICE_PORT" |
| ... | ... |
@@ -530,7 +529,7 @@ function create_nova_conf {
|
| 530 | 530 |
iniset_rpc_backend nova $NOVA_CONF DEFAULT |
| 531 | 531 |
iniset $NOVA_CONF glance api_servers "${GLANCE_SERVICE_PROTOCOL}://${GLANCE_HOSTPORT}"
|
| 532 | 532 |
|
| 533 |
- iniset $NOVA_CONF DEFAULT osci_compute_workers "$API_WORKERS" |
|
| 533 |
+ iniset $NOVA_CONF DEFAULT osapi_compute_workers "$API_WORKERS" |
|
| 534 | 534 |
iniset $NOVA_CONF DEFAULT ec2_workers "$API_WORKERS" |
| 535 | 535 |
iniset $NOVA_CONF DEFAULT metadata_workers "$API_WORKERS" |
| 536 | 536 |
|