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/share/mason.conf | |
| 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/share/mason.conf')
| -rw-r--r-- | mason/share/mason.conf | 2 |
1 files changed, 1 insertions, 1 deletions
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 %} |