switch to using -f rather than -a. This has been overlooked
in a review recently merged. Without this fix, devstack on
XenServer is broken.
Change-Id: I1882cc70528772287241848adea3a520738d4144
| ... | ... |
@@ -19,12 +19,7 @@ |
| 19 | 19 |
|
| 20 | 20 |
set -eux |
| 21 | 21 |
|
| 22 |
-if [ -a /etc/xensource-inventory] |
|
| 23 |
-then |
|
| 24 |
- . /etc/xensource-inventory |
|
| 25 |
-else |
|
| 26 |
- . /etc/xcp/inventory |
|
| 27 |
-fi |
|
| 22 |
+[[ -f "/etc/xensource-inventory" ]] && source "/etc/xensource-inventory" || source "/etc/xcp/inventory" |
|
| 28 | 23 |
|
| 29 | 24 |
NAME="XenServer OpenStack VPX" |
| 30 | 25 |
DATA_VDI_SIZE="500MiB" |