Modernize VIRT_DRIVER=fake usage

Code Issues Proposed changes

This makes three changes:
1. The quota options set when using the fake
 virt driver have been renamed so we're getting
 deprecation warnings on using the old names.
 Rather than set each quota limit value individually,
 we can just use the noop quota driver for the same
 effect.
2. The enabled_filters list for the scheduler was last
 updated when using the fake virt driver back in Juno
 via Ic7ec87e4d497d9db58eec93f2b304fe9770a2bbc - with
 the Placement service, we don't need the CoreFilter,
 RamFilter or DiskFilter. Also, in general, we just
 don't need to hard-code a list of scheduler filters
 when using the fake virt driver. If one needs to set
 their own scheduler filter list, they can do so using
 the $FILTERS variable (or post-config for nova.conf).
3. The largeops job, which ran the Tempest scenario tests,
 has been gone for a few years now, as have the Tempest
 scenario tests, so the API_WORKERS modification when
 using the fake virt driver should be removed. If we had
 a CI job like the largeops job today, we would set the
 worker config via the job rather than in devstack.
Change-Id: I8d2bb2af40b5db8a555482a0852b1604aec29f15

This commit is contained in:

Matt Riedemann

2018年06月02日 12:40:58 -04:00

parent 0d1bee1768

commit 5e832d3061

2 changed files with 2 additions and 18 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

13
lib/nova_plugins/hypervisor-fake

View File

@@ -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

7
stackrc

View File

@@ -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}