diff options
Diffstat (limited to 'mason')
| -rw-r--r-- | mason/ansible/mason-setup.yml | 1 | ||||
| -rwxr-xr-x | mason/mason.sh | 4 | ||||
| -rw-r--r-- | mason/share/mason.conf | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/mason/ansible/mason-setup.yml b/mason/ansible/mason-setup.yml index 08490e78..d1528dbb 100644 --- a/mason/ansible/mason-setup.yml +++ b/mason/ansible/mason-setup.yml @@ -2,7 +2,6 @@ - hosts: localhost vars_files: - "/etc/mason/mason.conf" - - "/etc/mason/os.conf" tasks: 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 diff --git a/mason/share/mason.conf b/mason/share/mason.conf index abbf357a..1295ce84 100644 --- a/mason/share/mason.conf +++ b/mason/share/mason.conf @@ -11,4 +11,4 @@ TROVE_ID={{ TROVE_ID|quote }} BUILD_CLUSTER_MORPHOLOGY={{ MASON_CLUSTER_MORPHOLOGY|quote }} MASON_TEST_HOST={{ MASON_TEST_HOST|quote }} TEST_INFRASTRUCTURE_TYPE={{ TEST_INFRASTRUCTURE_TYPE|quote }} -OPENSTACK_NETWORK_ID={{ OPENSTACK_NETWORK_ID|quote }} +{% if OPENSTACK_NETWORK_ID is defined %}OPENSTACK_NETWORK_ID={{ OPENSTACK_NETWORK_ID|quote }}{% endif %} |