openstack/devstack
Code Issues Proposed changes

Merge "Don't special case Grenade + systemd"

Browse Source
This commit is contained in:
Jenkins
2017-08-16 02:33:00 +00:00
committed by Gerrit Code Review
parent ac1a6aab2c 6b354a9095
commit 371e6e1055
1 changed files with 1 additions and 4 deletions
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 # 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. # systemd. This allows us to drop one of 3 paths through the code.
if [[ "$USE_SCREEN" == "False" ]]; then if [[ "$USE_SCREEN" == "False" ]]; then
# Remove in Pike: this gets us through grenade upgrade USE_SYSTEMD="True"
if [[ "$GRENADE_PHASE" != "target" ]]; then
USE_SYSTEMD="True"
fi
fi fi
# Default for log coloring is based on interactive-or-not. # Default for log coloring is based on interactive-or-not.