openstack/devstack
Code Issues Proposed changes

Don't special case Grenade + systemd

Browse Source 
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
This commit is contained in:
Clark Boylan 2017-08-14 13:58:30 -07:00
parent 967e81c8c3
commit 6b354a9095
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
stackrc
View File

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