Browse code
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
Clark Boylan authored on 2017/08/15 05:58:30Showing 1 changed files
| ... | ... |
@@ -174,10 +174,7 @@ fi |
| 174 | 174 |
# if we are forcing off USE_SCREEN (as we do in the gate), force on |
| 175 | 175 |
# systemd. This allows us to drop one of 3 paths through the code. |
| 176 | 176 |
if [[ "$USE_SCREEN" == "False" ]]; then |
| 177 |
- # Remove in Pike: this gets us through grenade upgrade |
|
| 178 |
- if [[ "$GRENADE_PHASE" != "target" ]]; then |
|
| 179 |
- USE_SYSTEMD="True" |
|
| 180 |
- fi |
|
| 177 |
+ USE_SYSTEMD="True" |
|
| 181 | 178 |
fi |
| 182 | 179 |
|
| 183 | 180 |
# Default for log coloring is based on interactive-or-not. |