aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.tenant
diff options
context:
space:
mode:
authorYifei Xue <xueyifei@huawei.com>2017-12-11 16:08:16 +0800
committerYifei Xue <xueyifei@huawei.com>2017-12-12 17:49:13 +0800
commitd30fc513bbda9fb2ab8421ed795b89c25bc08f7d (patch)
treed756617467b00fc7bdfedd954022b8b28c3d2cfa /deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.tenant
parent5fbadc0b9b5d8726050906d0923abfe7ea5ce1c0 (diff)
Bug fix for CentOS BM deployment
JIRA: - In order to configure network for OSA deployment, it's needed to install some packages, such as bridge-utils, iputils, etc. So we configure external network before using yum to install packages. Change-Id: I87864d6bdae79184aa82223f77b6ced1d0e9cf26 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.tenant')
-rw-r--r--deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.tenant9
1 files changed, 7 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.tenant b/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.tenant
index 2a114f7..b36fa10 100644
--- a/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.tenant
+++ b/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.tenant
@@ -1,4 +1,9 @@
-DEVICE={{compu_sys_mappings["tenant"]["interface"]}}.{{compu_sys_mappings["tenant"]["vlan_tag"]}}
+DEVICE={{ intf_tenant }}
BOOTPROTO=none
ONBOOT=yes
-VLAN=yes
+{% if compu_sys_mappings["tenant"]["vlan_tag"] | int %}
+{% set intf_vlan = "yes" %}
+{% else %}
+{% set intf_vlan = "no" %}
+{% endif %}
+VLAN={{ intf_vlan }}