diff options
| author |   Yifei Xue <xueyifei@huawei.com> | 2017-12-11 16:08:16 +0800 |
|---|---|---|
| committer | Yifei Xue <xueyifei@huawei.com> | 2017-12-12 17:49:13 +0800 |
| commit | d30fc513bbda9fb2ab8421ed795b89c25bc08f7d (patch) | |
| tree | d756617467b00fc7bdfedd954022b8b28c3d2cfa /deploy/adapters/ansible/roles/config-controller/templates | |
| parent | 5fbadc0b9b5d8726050906d0923abfe7ea5ce1c0 (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-controller/templates')
3 files changed, 16 insertions, 5 deletions
diff --git a/deploy/adapters/ansible/roles/config-controller/templates/ifcfg-br-mgmt b/deploy/adapters/ansible/roles/config-controller/templates/ifcfg-br-mgmt index 2e958cc7..184f752b 100644 --- a/deploy/adapters/ansible/roles/config-controller/templates/ifcfg-br-mgmt +++ b/deploy/adapters/ansible/roles/config-controller/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-controller/templates/ifcfg-if.storage b/deploy/adapters/ansible/roles/config-controller/templates/ifcfg-if.storage index b71a80cf..c0a14049 100644 --- a/deploy/adapters/ansible/roles/config-controller/templates/ifcfg-if.storage +++ b/deploy/adapters/ansible/roles/config-controller/templates/ifcfg-if.storage @@ -1,4 +1,9 @@ -DEVICE={{contr_sys_mappings["storage"]["interface"]}}.{{contr_sys_mappings["storage"]["vlan_tag"]}} -BOOTPROTO=none +DEVICE={{ intf_storage }} ONBOOT=yes -VLAN=yes +{% if contr_sys_mappings["storage"]["vlan_tag"] | int %} +{% set intf_vlan = "yes" %} +{% else %} +{% set intf_vlan = "no" %} +{% endif %} +VLAN={{ intf_vlan }} +BOOTPROTO=none diff --git a/deploy/adapters/ansible/roles/config-controller/templates/ifcfg-if.tenant b/deploy/adapters/ansible/roles/config-controller/templates/ifcfg-if.tenant index bc9f2a57..b45c001f 100644 --- a/deploy/adapters/ansible/roles/config-controller/templates/ifcfg-if.tenant +++ b/deploy/adapters/ansible/roles/config-controller/templates/ifcfg-if.tenant @@ -1,4 +1,9 @@ -DEVICE={{contr_sys_mappings["tenant"]["interface"]}}.{{contr_sys_mappings["tenant"]["vlan_tag"]}} +DEVICE={{ intf_tenant }} BOOTPROTO=none ONBOOT=yes -VLAN=yes +{% if contr_sys_mappings["tenant"]["vlan_tag"] | int %} +{% set intf_vlan = "yes" %} +{% else %} +{% set intf_vlan = "no" %} +{% endif %} +VLAN={{ intf_vlan }} |