Commit 1fdbf2c
committed
fix(Makefile): use fleetctl to filter actual deis-* units
Call `fleetctl` to see which deis-* units are actually loaded, and then
reference only those in the `make stop` and `make uninstall` commands.
This avoids requiring special logic for router(s) except on start.
Requires `awk`, `sed`, and `tr` utilities, which should be ubiquitous.
This also is future-proofing for `fleetctl` 3.x, which returns errors in
many cases where version 2.0 allowed us to be sloppy. Thus the `deis_units`
def is written to accept filters on columns 2 (LOAD) and 4 (SUB) of the
fleetctl output. We will make more use of this when moving to CoreOS 317.0.0.
Closes #991.1 parent 5110e55 commit 1fdbf2c
1 file changed
Lines changed: 13 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
45 | 51 | | |
46 | 52 | | |
47 | 53 | | |
| |||
110 | 116 | | |
111 | 117 | | |
112 | 118 | | |
113 | | - | |
114 | | - | |
115 | | - | |
116 | | - | |
117 | | - | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
118 | 124 | | |
119 | 125 | | |
120 | 126 | | |
121 | 127 | | |
122 | 128 | | |
123 | 129 | | |
124 | | - | |
| 130 | + | |
125 | 131 | | |
126 | 132 | | |
127 | 133 | | |
128 | 134 | | |
129 | 135 | | |
130 | | - | |
| 136 | + | |
0 commit comments