@@ -38,18 +38,7 @@ function cleanup_nova_hypervisor {

 function configure_nova_hypervisor {

     iniset $NOVA_CONF DEFAULT compute_driver "fake.FakeDriver"

     # Disable arbitrary limits

-    iniset $NOVA_CONF DEFAULT quota_instances -1

-    iniset $NOVA_CONF DEFAULT quota_cores -1

-    iniset $NOVA_CONF DEFAULT quota_ram -1

-    iniset $NOVA_CONF DEFAULT quota_floating_ips -1

-    iniset $NOVA_CONF DEFAULT quota_fixed_ips -1

-    iniset $NOVA_CONF DEFAULT quota_metadata_items -1

-    iniset $NOVA_CONF DEFAULT quota_injected_files -1

-    iniset $NOVA_CONF DEFAULT quota_injected_file_path_length -1

-    iniset $NOVA_CONF DEFAULT quota_security_groups -1

-    iniset $NOVA_CONF DEFAULT quota_security_group_rules -1

-    iniset $NOVA_CONF DEFAULT quota_key_pairs -1

-    iniset $NOVA_CONF filter_scheduler enabled_filters "RetryFilter,AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,CoreFilter,RamFilter,DiskFilter"

+    iniset $NOVA_CONF quota driver nova.quota.NoopQuotaDriver

 }

 # install_nova_hypervisor() - Install external components

@@ -800,12 +800,7 @@ SERVICE_PROTOCOL=${SERVICE_PROTOCOL:-http}

 # 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)

 # Also sets the minimum number of workers to 2.

-if [[ "$VIRT_DRIVER" = 'fake' ]]; then

-    # we need more workers for the large ops job

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

-else

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

-fi

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

 # Service startup timeout

 SERVICE_TIMEOUT=${SERVICE_TIMEOUT:-60}