commit 5ec4d57730fb8c620b3f221bde5601574141e032
author Dennis Dmitriev <ddmitriev@mirantis.com> Wed Sep 27 00:47:54 2017 +0300
committer Dennis Dmitriev <dis.xcom@gmail.com> Tue Sep 26 17:50:24 2017 -0400
tree 8f0c706ffe829ccd1e8b8e323681e31d3420d460
parent b2e78be48f50441b513ac7b174c50c7292b8cf4c

Add imports for DOMAIN_NAME and LAB_CONFIG_NAME for all templates

Change-Id: I36d8cd8f945fd76f9a7460823c999bbc90cf27bc
Reviewed-on: https://review.gerrithub.io/380067
Reviewed-by: Dennis Dmitriev <dis.xcom@gmail.com>
Tested-by: Dennis Dmitriev <dis.xcom@gmail.com>

tcp_tests/templates/virtual-mcp10-contrail/underlay.yaml

diff --git a/tcp_tests/templates/virtual-mcp10-contrail/underlay.yaml b/tcp_tests/templates/virtual-mcp10-contrail/underlay.yaml
index 867cac1..5ee6958 100644
--- a/tcp_tests/templates/virtual-mcp10-contrail/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp10-contrail/underlay.yaml
@@ -14,7 +14,8 @@
  - &cloudinit_user_data_1604 {{ CLOUDINIT_USER_DATA_1604 }}
  - &cloudinit_user_data_1404 {{ CLOUDINIT_USER_DATA_1404 }}
 
-{% set DOMAIN_NAME = os_env('LAB_CONFIG_NAME', 'virtual-mcp10-contrail') + '.local' %}
+{% set LAB_CONFIG_NAME = os_env('LAB_CONFIG_NAME', 'virtual-mcp10-contrail') %}
+{% set DOMAIN_NAME = os_env('DOMAIN_NAME', LAB_CONFIG_NAME) + '.local' %}
 {% set HOSTNAME_CFG01 = os_env('HOSTNAME_CFG01', 'cfg01.' + DOMAIN_NAME) %}
 {% set HOSTNAME_CTL01 = os_env('HOSTNAME_CTL01', 'ctl01.' + DOMAIN_NAME) %}
 {% set HOSTNAME_CTL02 = os_env('HOSTNAME_CTL02', 'ctl02.' + DOMAIN_NAME) %}