From 81a2f9186eafbfb2f274b7a05b6cd5b0b7e7c355 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Wed, 23 Jun 2021 17:52:21 +0800 Subject: [PATCH] =?UTF-8?q?feature:=E6=96=B0=E5=A2=9E7400=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E4=B8=8B=E9=80=82=E9=85=8DNPB=E4=B8=BAtera=E7=9A=84?= =?UTF-8?q?=E7=BD=91=E7=BB=9C=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provision.yml.7400MCN0P01R01 | 24 +++++++++++++++++++ .../adapt_tera_network_setting.sh.j2 | 11 +++++++++ 2 files changed, 35 insertions(+) create mode 100644 ansible/roles/tsg-os-provision/files/tsg-os-provision/templates/adapt_tera_network_setting.sh.j2 diff --git a/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN0P01R01 b/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN0P01R01 index 061aa288..b1d24fa6 100644 --- a/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN0P01R01 +++ b/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN0P01R01 @@ -3,6 +3,30 @@ vars_files: - '{{var_files_path}}' tasks: + - name: "template adapt_tera_network_setting.sh when NPB device is tera" + template: + src: ../templates/adapt_tera_network_setting.sh.j2 + dest: /opt/tsg/tsg-os-provision/adapt_tera_network_setting.sh + mode: 0755 + when: npb_device == tera + + - name: "execute adapt_tera_network_setting.sh when NPB device is tera" + shell: /opt/tsg/tsg-os-provision/adapt_tera_network_setting.sh + register: result_exec_adapt_tera_network_setting + when: npb_device == tera + + - name: "Output results that executes command that gets the result_exec_adapt_tera_network_setting" + debug: + msg: "{{ result_exec_adapt_tera_network_setting }}" + + - name: "Verify result_exec_adapt_tera_network_setting" + assert: + that: + - result_exec_adapt_tera_network_setting.rc == 0 + - result_exec_adapt_tera_network_setting.failed == False + fail_msg: "error:{{ result_exec_adapt_tera_network_setting.stderr }},stdout:{{ result_exec_adapt_tera_network_setting }}" + success_msg: "{{ result_exec_adapt_tera_network_setting.stdout_lines[0] }}" + - name: "set sapp_overlay_mode var depend on NPB device" set_fact: sapp_overlay_mode: item.sapp_overlay_mode diff --git a/ansible/roles/tsg-os-provision/files/tsg-os-provision/templates/adapt_tera_network_setting.sh.j2 b/ansible/roles/tsg-os-provision/files/tsg-os-provision/templates/adapt_tera_network_setting.sh.j2 new file mode 100644 index 00000000..bab66f3b --- /dev/null +++ b/ansible/roles/tsg-os-provision/files/tsg-os-provision/templates/adapt_tera_network_setting.sh.j2 @@ -0,0 +1,11 @@ +#!/bin/bash -ex +{% for zone_group in tera_steering_group %} +ip link add link eth_rsv name eth_rsv.{{ zone_group.internal.vlan_id }} type vlan id {{ zone_group.internal.vlan_id }} +ip addr add {{ zone_group.internal.keepalive.ipv4 }} dev eth_rsv.{{ zone_group.internal.vlan_id }} +ip -6 addr add {{ zone_group.internal.keepalive.ipv6 }} dev eth_rsv.{{ zone_group.internal.vlan_id }} +ifconfig eth_rsv.{{ zone_group.internal.vlan_id }} up +ip link add link eth_rsv name eth_rsv.{{ zone_group.external.vlan_id }} type vlan id {{ zone_group.external.vlan_id }} +ip addr add {{ zone_group.external.keepalive.ipv4 }} dev eth_rsv.{{ zone_group.external.vlan_id }} +ip -6 addr add {{ zone_group.external.keepalive.ipv6 }} dev eth_rsv.{{ zone_group.external.vlan_id }} +ifconfig eth_rsv.{{ zone_group.external.vlan_id }} up +{% endfor %} \ No newline at end of file