From d30fc513bbda9fb2ab8421ed795b89c25bc08f7d Mon Sep 17 00:00:00 2001 From: Yifei Xue Date: Mon, 11 Dec 2017 16:08:16 +0800 Subject: 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 --- .../ansible/roles/config-compute/templates/ifcfg-br-mgmt | 1 + .../ansible/roles/config-compute/templates/ifcfg-if.storage | 9 +++++++-- .../ansible/roles/config-compute/templates/ifcfg-if.tenant | 9 +++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) (limited to 'deploy/adapters/ansible/roles/config-compute/templates') diff --git a/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-br-mgmt b/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-br-mgmt index 2e958cc7..184f752b 100644 --- a/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-br-mgmt +++ b/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-br-mgmt @@ -5,3 +5,4 @@ PREFIX=24 BOOTPROTO=none ONBOOT=yes DELAY=0 +DEFROUTE="no" diff --git a/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.storage b/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.storage index 2e409205..eecc7a42 100644 --- a/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.storage +++ b/deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.storage @@ -1,4 +1,9 @@ -DEVICE={{compu_sys_mappings["storage"]["interface"]}}.{{compu_sys_mappings["storage"]["vlan_tag"]}} +DEVICE={{ intf_storage }} BOOTPROTO=none ONBOOT=yes -VLAN=yes +{% if compu_sys_mappings["storage"]["vlan_tag"] | int %} +{% set intf_vlan = "yes" %} +{% else %} +{% set intf_vlan = "no" %} +{% endif %} +VLAN={{ intf_vlan }} 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 2a114f7c..b36fa105 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 }} -- cgit 1.2.3-korg