From 6b354a909535a9dfef164c3e844544989d17514a Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 14 Aug 2017 13:58:30 -0700 Subject: [PATCH] Don't special case Grenade + systemd Now that the pike branch exists we don't want to special case grenade + system on the target side. We should use systemd for both sides of the pike -> master upgrade. Note this change should not be backported so that we do not attempt to use systemd on the ocata -> pike upgrade path. Depends-On: Iedf824a1772115e0dff287a898636f8e58471269 Change-Id: I6198bf1842a44773fce80672c81eee3afc3c6f38 --- stackrc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/stackrc b/stackrc index 877da82261..18c1ce76ce 100644 --- a/stackrc +++ b/stackrc @@ -174,10 +174,7 @@ fi # 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.