Modernize VIRT_DRIVER=fake usage
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
Matt Riedemann authored on 2018/06/03 01:40:58Showing 2 changed files
| ... | ... |
@@ -38,18 +38,7 @@ function cleanup_nova_hypervisor {
|
| 38 | 38 |
function configure_nova_hypervisor {
|
| 39 | 39 |
iniset $NOVA_CONF DEFAULT compute_driver "fake.FakeDriver" |
| 40 | 40 |
# Disable arbitrary limits |
| 41 |
- iniset $NOVA_CONF DEFAULT quota_instances -1 |
|
| 42 |
- iniset $NOVA_CONF DEFAULT quota_cores -1 |
|
| 43 |
- iniset $NOVA_CONF DEFAULT quota_ram -1 |
|
| 44 |
- iniset $NOVA_CONF DEFAULT quota_floating_ips -1 |
|
| 45 |
- iniset $NOVA_CONF DEFAULT quota_fixed_ips -1 |
|
| 46 |
- iniset $NOVA_CONF DEFAULT quota_metadata_items -1 |
|
| 47 |
- iniset $NOVA_CONF DEFAULT quota_injected_files -1 |
|
| 48 |
- iniset $NOVA_CONF DEFAULT quota_injected_file_path_length -1 |
|
| 49 |
- iniset $NOVA_CONF DEFAULT quota_security_groups -1 |
|
| 50 |
- iniset $NOVA_CONF DEFAULT quota_security_group_rules -1 |
|
| 51 |
- iniset $NOVA_CONF DEFAULT quota_key_pairs -1 |
|
| 52 |
- iniset $NOVA_CONF filter_scheduler enabled_filters "RetryFilter,AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,CoreFilter,RamFilter,DiskFilter" |
|
| 41 |
+ iniset $NOVA_CONF quota driver nova.quota.NoopQuotaDriver |
|
| 53 | 42 |
} |
| 54 | 43 |
|
| 55 | 44 |
# install_nova_hypervisor() - Install external components |
| ... | ... |
@@ -800,12 +800,7 @@ SERVICE_PROTOCOL=${SERVICE_PROTOCOL:-http}
|
| 800 | 800 |
# the memory used where there are a large number of CPUs present |
| 801 | 801 |
# (the default number of workers for many services is the number of CPUs) |
| 802 | 802 |
# Also sets the minimum number of workers to 2. |
| 803 |
-if [[ "$VIRT_DRIVER" = 'fake' ]]; then |
|
| 804 |
- # we need more workers for the large ops job |
|
| 805 |
- API_WORKERS=${API_WORKERS:=$(( ($(nproc)/2)<2 ? 2 : ($(nproc)/2) ))}
|
|
| 806 |
-else |
|
| 807 |
- API_WORKERS=${API_WORKERS:=$(( ($(nproc)/4)<2 ? 2 : ($(nproc)/4) ))}
|
|
| 808 |
-fi |
|
| 803 |
+API_WORKERS=${API_WORKERS:=$(( ($(nproc)/4)<2 ? 2 : ($(nproc)/4) ))}
|
|
| 809 | 804 |
|
| 810 | 805 |
# Service startup timeout |
| 811 | 806 |
SERVICE_TIMEOUT=${SERVICE_TIMEOUT:-60}
|