Merge "Increase host_subset_size for ironic"
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/stackrc b/stackrc
index b03426f..b123d8a 100644
--- a/stackrc
+++ b/stackrc
@@ -174,10 +174,7 @@
# if we are forcing off USE_SCREEN (as we do in the gate), force on
# systemd. This allows us to drop one of 3 paths through the code.
if [[ "$USE_SCREEN" == "False" ]]; then
- # Remove in Pike: this gets us through grenade upgrade
- if [[ "$GRENADE_PHASE" != "target" ]]; then
- USE_SYSTEMD="True"
- fi
+ USE_SYSTEMD="True"
fi
# Default for log coloring is based on interactive-or-not.