commit 1469a04f183553be197166d2abeb3a6f94894d38
author Jenkins <jenkins@review.openstack.org> Wed Jun 11 10:06:49 2014 +0000
committer Gerrit Code Review <review@openstack.org> Wed Jun 11 10:06:49 2014 +0000
tree 6de106ea230231107ba28d6c5b34e6bb491e1ed5
parent b93e230807f5c8a986b6ab6c7526db4663abad41
parent 9800256ba7d1b47d1f9bd2ab2586ca31dc360e8f

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

lib/nova

diff --git a/lib/nova b/lib/nova
index 722eabb..61ef64b 100644
--- a/lib/nova
+++ b/lib/nova
@@ -438,10 +438,6 @@
     iniset $NOVA_CONF DEFAULT s3_host "$SERVICE_HOST"
     iniset $NOVA_CONF DEFAULT s3_port "$S3_SERVICE_PORT"
     iniset $NOVA_CONF DEFAULT my_ip "$HOST_IP"
-    iniset $NOVA_CONF DEFAULT osapi_compute_workers "4"
-    iniset $NOVA_CONF DEFAULT ec2_workers "4"
-    iniset $NOVA_CONF DEFAULT metadata_workers "4"
-    iniset $NOVA_CONF conductor workers "4"
     iniset $NOVA_CONF DEFAULT sql_connection `database_connection_url nova`
     iniset $NOVA_CONF DEFAULT instance_name_template "${INSTANCE_NAME_PREFIX}%08x"
     iniset $NOVA_CONF osapi_v3 enabled "True"