1. devstack
  2. Commit 1469a04f183553be197166d2abeb3a6f94894d38
Browse code

Merge "Don't set nova api/conductor workers since nova handles this"

Jenkins authored on 2014/06/11 19:06:49
Showing 1 changed files
lib/nova
History View file @ 1469a04
... ... 
@@ -438,10 +438,6 @@ function create_nova_conf {
438 438 
     iniset $NOVA_CONF DEFAULT s3_host "$SERVICE_HOST"
439 439 
     iniset $NOVA_CONF DEFAULT s3_port "$S3_SERVICE_PORT"
440 440 
     iniset $NOVA_CONF DEFAULT my_ip "$HOST_IP"
441 
-    iniset $NOVA_CONF DEFAULT osapi_compute_workers "4"
442 
-    iniset $NOVA_CONF DEFAULT ec2_workers "4"
443 
-    iniset $NOVA_CONF DEFAULT metadata_workers "4"
444 
-    iniset $NOVA_CONF conductor workers "4"
445 441 
     iniset $NOVA_CONF DEFAULT sql_connection `database_connection_url nova`
446 442 
     iniset $NOVA_CONF DEFAULT instance_name_template "${INSTANCE_NAME_PREFIX}%08x"
447 443 
     iniset $NOVA_CONF osapi_v3 enabled "True"