From 1f79bad7ecc28d472b1e2c185fdba7a9dd61a524 Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Fri, 26 Sep 2014 09:59:47 -0700 Subject: [PATCH] Stop setting nova.conf settings that mean nothing * DEFAULT.fixed_range isn't a valid option in nova anymore * DEFAULT.osci_compute_workers was never a thing, it should be DEFAULT.osapi_compute_workers Change-Id: Ib08f3e20e4685b331385431276f890205fa76da6 --- lib/nova | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/nova b/lib/nova index cfa6f7a8ec..4d4aeae97d 100644 --- a/lib/nova +++ b/lib/nova @@ -421,7 +421,6 @@ function create_nova_conf { iniset $NOVA_CONF DEFAULT scheduler_driver "$SCHEDULER" iniset $NOVA_CONF DEFAULT dhcpbridge_flagfile "$NOVA_CONF" iniset $NOVA_CONF DEFAULT force_dhcp_release "True" - iniset $NOVA_CONF DEFAULT fixed_range "" iniset $NOVA_CONF DEFAULT default_floating_pool "$PUBLIC_NETWORK_NAME" iniset $NOVA_CONF DEFAULT s3_host "$SERVICE_HOST" iniset $NOVA_CONF DEFAULT s3_port "$S3_SERVICE_PORT" @@ -531,7 +530,7 @@ function create_nova_conf { iniset_rpc_backend nova $NOVA_CONF DEFAULT iniset $NOVA_CONF glance api_servers "${GLANCE_SERVICE_PROTOCOL}://${GLANCE_HOSTPORT}" - iniset $NOVA_CONF DEFAULT osci_compute_workers "$API_WORKERS" + iniset $NOVA_CONF DEFAULT osapi_compute_workers "$API_WORKERS" iniset $NOVA_CONF DEFAULT ec2_workers "$API_WORKERS" iniset $NOVA_CONF DEFAULT metadata_workers "$API_WORKERS"