Browse code

Merge "Allow setting the number of workers to be used."

Jenkins authored on 2014/09/13 16:18:05
Showing 4 changed files
... ...
@@ -307,6 +307,9 @@ function configure_cinder {
307 307
     iniset $CINDER_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
308 308
     iniset $CINDER_CONF keystone_authtoken admin_password $SERVICE_PASSWORD
309 309
 
310
+    if [ -n "$API_WORKERS" ]; then
311
+        iniset $CINDER_CONF DEFAULT osapi_volume_workers "$API_WORKERS"
312
+    fi
310 313
 }
311 314
 
312 315
 # create_cinder_accounts() - Set up common required cinder accounts
... ...
@@ -138,6 +138,10 @@ function configure_glance {
138 138
     # sections.
139 139
     iniset $GLANCE_API_CONF glance_store filesystem_store_datadir $GLANCE_IMAGE_DIR/
140 140
 
141
+    if [ -n "$API_WORKERS" ]; then
142
+        iniset $GLANCE_API_CONF DEFAULT workers "$API_WORKERS"
143
+    fi
144
+
141 145
     # Store the images in swift if enabled.
142 146
     if is_service_enabled s-proxy; then
143 147
         iniset $GLANCE_API_CONF DEFAULT default_store swift
... ...
@@ -516,6 +516,12 @@ function create_nova_conf {
516 516
     iniset $NOVA_CONF DEFAULT ec2_dmz_host "$EC2_DMZ_HOST"
517 517
     iniset_rpc_backend nova $NOVA_CONF DEFAULT
518 518
     iniset $NOVA_CONF glance api_servers "$GLANCE_HOSTPORT"
519
+
520
+    if [ -n "$API_WORKERS" ]; then
521
+        iniset $NOVA_CONF DEFAULT osci_compute_workers "$API_WORKERS"
522
+        iniset $NOVA_CONF DEFAULT ec2_workers "$API_WORKERS"
523
+        iniset $NOVA_CONF DEFAULT metadata_workers "$API_WORKERS"
524
+    fi
519 525
 }
520 526
 
521 527
 function init_nova_cells {
... ...
@@ -508,6 +508,11 @@ UNDO_REQUIREMENTS=${UNDO_REQUIREMENTS:-True}
508 508
 # Allow the use of an alternate protocol (such as https) for service endpoints
509 509
 SERVICE_PROTOCOL=${SERVICE_PROTOCOL:-http}
510 510
 
511
+# Sets the maximum number of workers for various services and can restrict
512
+# the memory used where there are a large number of CPUs present
513
+# (the default number of workers for many services is the number of CPUs)
514
+# API_WORKERS=4
515
+
511 516
 # Local variables:
512 517
 # mode: shell-script
513 518
 # End: