Merge "Updated from generate-devstack-plugins-list"
diff --git a/lib/nova b/lib/nova
index 31b51c7..fa09fd8 100644
--- a/lib/nova
+++ b/lib/nova
@@ -988,6 +988,11 @@
}
function stop_nova_conductor {
+ if [[ "${CELLSV2_SETUP}" == "singleconductor" ]]; then
+ stop_process n-cond
+ return
+ fi
+
enable_nova_fleet
for srv in n-super-cond $(seq -f n-cond-cell%0.f 1 $NOVA_NUM_CELLS); do
if is_service_enabled $srv; then
diff --git a/lib/nova_plugins/hypervisor-ironic b/lib/nova_plugins/hypervisor-ironic
index d59473c..062afb7 100644
--- a/lib/nova_plugins/hypervisor-ironic
+++ b/lib/nova_plugins/hypervisor-ironic
@@ -47,6 +47,8 @@
iniset $NOVA_CONF filter_scheduler use_baremetal_filters True
fi
+ iniset $NOVA_CONF filter_scheduler host_subset_size 999
+
iniset $NOVA_CONF DEFAULT ram_allocation_ratio 1.0
iniset $NOVA_CONF DEFAULT reserved_host_memory_mb 0
# ironic section