diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-11-19 17:24:56 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-11-19 17:24:56 +0000 |
| commit | 87df3c1fca6771141fd045785e8118289e6503d6 (patch) | |
| tree | 8e67f899e80b0874740c96e00756d376726c5abe /mason/mason.sh | |
| parent | 0f90d4a8219199f6941da600f173f96b06bc5a52 (diff) | |
| parent | f85eaa58f6e68dd1641246e68b8ab9e87a5b7633 (diff) | |
| download | definitions-87df3c1fca6771141fd045785e8118289e6503d6.tar.gz | |
Merge branch 'baserock/pedroalvarez/fix-generic-mason'
Reviewed-by:
- Richard Maw
- Francisco Redondo Marchena
Diffstat (limited to 'mason/mason.sh')
| -rwxr-xr-x | mason/mason.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mason/mason.sh b/mason/mason.sh index 5d27b7cf..dba99dfa 100755 --- a/mason/mason.sh +++ b/mason/mason.sh @@ -1,7 +1,9 @@ #!/bin/sh # Load OpenStack credentials -. /etc/os.conf +if [ -f "/etc/os.conf" ]; then + . /etc/os.conf +fi set -e set -x |