| commit | 05bd7b803d87bbdd1a6f11cfd278eec319c819ea | [log] [tgz] |
|---|---|---|
| author | Dean Troyer <dtroyer@gmail.com> | Tue Sep 16 17:25:33 2014 -0500 |
| committer | Dean Troyer <dtroyer@gmail.com> | Fri Sep 19 09:06:21 2014 -0500 |
| tree | 52a763035448ccc5668e52052b7b495a3e26da9f | |
| parent | 7672ad1dbc00ec5ff80f3aa670404e413e86e506 [diff] [blame] |
Set default API_WORKERS Set the API_WORKERS default to control memory usage. Maximum is nproc / 2 and minimum is 2. * Also updates https://review.openstack.org/#/c/117517/ to remove the conditional test as API_WORKERS should always be set. * Update https://review.openstack.org/#/c/109058/ for ceilometer to use API_WORKERS The following reviews can move forward either as-is or with minor tweaks: * Keystone: https://review.openstack.org/#/c/121384/ - remove the if check * Swift: https://review.openstack.org/#/c/121456/ - unabandon, the default to 1 is fine, or remove it to match the others. * Trove: https://review.openstack.org/#/c/121438/ - remove the if check https://etherpad.openstack.org/p/devstack-workers has the details Change-Id: Id28d72ebf01c88b7df301edf7d1dd7ec23fcd0d6
diff --git a/lib/cinder b/lib/cinder index 5c487a2..e767fa8 100644 --- a/lib/cinder +++ b/lib/cinder
@@ -307,9 +307,7 @@ 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