@@ -154,7 +154,7 @@ function configure_ceilometer {

     if [ "$CEILOMETER_BACKEND" = 'mysql' ] || [ "$CEILOMETER_BACKEND" = 'postgresql' ] ; then

         iniset $CEILOMETER_CONF database connection `database_connection_url ceilometer`

-        iniset $CEILOMETER_CONF DEFAULT collector_workers $(( ($(nproc) + 1) / 2 ))

+        iniset $CEILOMETER_CONF DEFAULT collector_workers $API_WORKERS

     else

         iniset $CEILOMETER_CONF database connection mongodb://localhost:27017/ceilometer

         configure_mongodb

@@ -307,9 +307,7 @@ function configure_cinder {

     iniset $CINDER_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME

     iniset $CINDER_CONF keystone_authtoken admin_password $SERVICE_PASSWORD

-    if [ -n "$API_WORKERS" ]; then

-        iniset $CINDER_CONF DEFAULT osapi_volume_workers "$API_WORKERS"

-    fi

+    iniset $CINDER_CONF DEFAULT osapi_volume_workers "$API_WORKERS"

 }

 # create_cinder_accounts() - Set up common required cinder accounts

@@ -138,9 +138,7 @@ function configure_glance {

     # sections.

     iniset $GLANCE_API_CONF glance_store filesystem_store_datadir $GLANCE_IMAGE_DIR/

-    if [ -n "$API_WORKERS" ]; then

-        iniset $GLANCE_API_CONF DEFAULT workers "$API_WORKERS"

-    fi

+    iniset $GLANCE_API_CONF DEFAULT workers "$API_WORKERS"

     # Store the images in swift if enabled.

     if is_service_enabled s-proxy; then

@@ -519,11 +519,9 @@ function create_nova_conf {

     iniset_rpc_backend nova $NOVA_CONF DEFAULT

     iniset $NOVA_CONF glance api_servers "$GLANCE_HOSTPORT"

-    if [ -n "$API_WORKERS" ]; then

-        iniset $NOVA_CONF DEFAULT osci_compute_workers "$API_WORKERS"

-        iniset $NOVA_CONF DEFAULT ec2_workers "$API_WORKERS"

-        iniset $NOVA_CONF DEFAULT metadata_workers "$API_WORKERS"

-    fi

+    iniset $NOVA_CONF DEFAULT osci_compute_workers "$API_WORKERS"

+    iniset $NOVA_CONF DEFAULT ec2_workers "$API_WORKERS"

+    iniset $NOVA_CONF DEFAULT metadata_workers "$API_WORKERS"

 }

 function init_nova_cells {

@@ -511,10 +511,11 @@ UNDO_REQUIREMENTS=${UNDO_REQUIREMENTS:-True}

 # Allow the use of an alternate protocol (such as https) for service endpoints

 SERVICE_PROTOCOL=${SERVICE_PROTOCOL:-http}

-# Sets the maximum number of workers for various services and can restrict

+# Sets the maximum number of workers for most services to reduce

 # the memory used where there are a large number of CPUs present

 # (the default number of workers for many services is the number of CPUs)

-# API_WORKERS=4

+# Also sets the minimum number of workers to 2.

+API_WORKERS=${API_WORKERS:=$(( ($(nproc)/2)<2 ? 2 : ($(nproc)/2) ))}

 # Local variables:

 # mode: shell-script