aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/config-compute
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
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')
-rw-r--r--deploy/adapters/ansible/roles/config-compute/tasks/RedHat.yml12
-rw-r--r--deploy/adapters/ansible/roles/config-compute/templates/ifcfg-br-mgmt1
-rw-r--r--deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.storage9
-rw-r--r--deploy/adapters/ansible/roles/config-compute/templates/ifcfg-if.tenant9
-rw-r--r--deploy/adapters/ansible/roles/config-compute/vars/main.yml21
5 files changed, 41 insertions, 11 deletions
diff --git a/deploy/adapters/ansible/roles/config-compute/tasks/RedHat.yml b/deploy/adapters/ansible/roles/config-compute/tasks/RedHat.yml
index 3ec1659f..ff91393d 100644
--- a/deploy/adapters/ansible/roles/config-compute/tasks/RedHat.yml
+++ b/deploy/adapters/ansible/roles/config-compute/tasks/RedHat.yml
@@ -14,20 +14,19 @@
shell: "echo 'nfs 2049/tcp' >> /etc/services; \
echo 'nfs 2049/udp' >> /etc/services"
-# yamllint disable rule:line-length
- name: generate ifcfg-if.tenant
template:
src: ifcfg-if.tenant
- dest: /etc/sysconfig/network-scripts/ifcfg-{{compu_sys_mappings["tenant"]["interface"]}}.{{compu_sys_mappings["tenant"]["vlan_tag"]}}
+ dest: /etc/sysconfig/network-scripts/ifcfg-{{ intf_tenant }}
- name: generate ifcfg-if.storage
template:
src: ifcfg-if.storage
- dest: /etc/sysconfig/network-scripts/ifcfg-{{compu_sys_mappings["storage"]["interface"]}}.{{compu_sys_mappings["storage"]["vlan_tag"]}}
+ dest: /etc/sysconfig/network-scripts/ifcfg-{{ intf_storage }}
- name: add br-external to interface script
lineinfile:
- dest: /etc/sysconfig/network-scripts/ifcfg-{{compu_sys_mappings["external"]["interface"]}}
+ dest: /etc/sysconfig/network-scripts/ifcfg-{{ intf_external }}
line: "BRIDGE=br-external"
- name: remove eth0 ip addresss
@@ -49,14 +48,13 @@
- name: add br-vlan to interface script
lineinfile:
- dest: /etc/sysconfig/network-scripts/ifcfg-{{compu_sys_mappings["storage"]["interface"]}}.{{compu_sys_mappings["storage"]["vlan_tag"]}}
+ dest: /etc/sysconfig/network-scripts/ifcfg-{{ intf_storage }}
line: "BRIDGE=br-storage"
- name: add br-tenant to interface script
lineinfile:
- dest: /etc/sysconfig/network-scripts/ifcfg-{{compu_sys_mappings["tenant"]["interface"]}}.{{compu_sys_mappings["tenant"]["vlan_tag"]}}
+ dest: /etc/sysconfig/network-scripts/ifcfg-{{ intf_tenant }}
line: "BRIDGE=br-tenant"
-# yamllint enable rule:line-length
- name: generate ifcfg-br-mgmt script
template:
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 }}
diff --git a/deploy/adapters/ansible/roles/config-compute/vars/main.yml b/deploy/adapters/ansible/roles/config-compute/vars/main.yml
index 783ea0d0..b157f910 100644
--- a/deploy/adapters/ansible/roles/config-compute/vars/main.yml
+++ b/deploy/adapters/ansible/roles/config-compute/vars/main.yml
@@ -8,3 +8,24 @@
# #############################################################################
---
LOCAL_REPOSITORY_IP: "192.168.137.222"
+
+intf_external: |-
+ {%- set intf_external = compu_sys_mappings["external"]["interface"] %}
+ {%- if compu_sys_mappings["external"]["vlan_tag"] | int %}
+ {%- set intf_external = intf_external + '.' + compu_sys_mappings["external"]["vlan_tag"]|string %}
+ {%- endif %}
+ {{- intf_external }}
+
+intf_tenant: |-
+ {%- set intf_tenant = compu_sys_mappings["tenant"]["interface"] %}
+ {%- if compu_sys_mappings["tenant"]["vlan_tag"] | int %}
+ {%- set intf_tenant = intf_tenant + '.' + compu_sys_mappings["tenant"]["vlan_tag"]|string %}
+ {%- endif %}
+ {{- intf_tenant }}
+
+intf_storage: |-
+ {%- set intf_storage = compu_sys_mappings["storage"]["interface"] %}
+ {%- if compu_sys_mappings["storage"]["vlan_tag"] | int %}
+ {%- set intf_storage = intf_storage + '.' + compu_sys_mappings["storage"]["vlan_tag"]|string %}
+ {%- endif %}
+ {{- intf_storage }}