From 260073269fb9bbde6d196cdb92454444bbd9afb4 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Thu, 24 Jun 2021 19:01:39 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=E5=88=A0=E9=99=A49140=E4=B8=8B=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=97=A5=E5=BF=97=E5=92=8C=E7=AD=96=E7=95=A5=E7=BD=91?= =?UTF-8?q?=E5=8D=A1=E7=9A=84=E5=8A=A8=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provision.yml.9000NPBP01R01 | 22 ------------------- .../setup_policy_log_nic_network.sh.j2 | 3 +++ ansible/roles/tsg-os-provision/tasks/main.yml | 7 +----- .../setup_policy_log_nic_network.sh.j2.j2 | 9 -------- 4 files changed, 4 insertions(+), 37 deletions(-) create mode 100644 ansible/roles/tsg-os-provision/files/tsg-os-provision/templates/setup_policy_log_nic_network.sh.j2 delete mode 100644 ansible/roles/tsg-os-provision/templates/setup_policy_log_nic_network.sh.j2.j2 diff --git a/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.9000NPBP01R01 b/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.9000NPBP01R01 index 99bb017b..078fec86 100644 --- a/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.9000NPBP01R01 +++ b/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.9000NPBP01R01 @@ -8,28 +8,6 @@ path: /opt/tsg/etc state: directory - - name: "template setup_policy_log_nic_network.sh" - template: - src: ../templates/setup_policy_log_nic_network.sh.j2 - dest: /data/tsg-os-provision/setup_policy_log_nic_network.sh - mode: 0755 - - - name: "execute setup_policy_log_nic_network.sh" - shell: /data/tsg-os-provision/setup_policy_log_nic_network.sh - register: result_exec_setup_policy_log_nic_network - - - name: "Output results that executes command that gets the result_exec_setup_policy_log_nic_network" - debug: - msg: "{{ result_exec_setup_policy_log_nic_network }}" - - - name: "Verify result_exec_setup_policy_log_nic_network" - assert: - that: - - result_exec_setup_policy_log_nic_network.rc == 0 - - result_exec_setup_policy_log_nic_network.failed == False - fail_msg: "error:{{ result_exec_setup_policy_log_nic_network.stderr }},stdout:{{ result_exec_setup_policy_log_nic_network }}" - success_msg: "{{ result_exec_setup_policy_log_nic_network.stdout_lines }}" - - name: "tsg-os-provision: obtain sn" shell: /opt/tsg/tsg-os-provision/obtain_sn.sh 127.0.0.1 register: result_exec_obtain_sn_and_write_sn_in_file diff --git a/ansible/roles/tsg-os-provision/files/tsg-os-provision/templates/setup_policy_log_nic_network.sh.j2 b/ansible/roles/tsg-os-provision/files/tsg-os-provision/templates/setup_policy_log_nic_network.sh.j2 new file mode 100644 index 00000000..ba88fb02 --- /dev/null +++ b/ansible/roles/tsg-os-provision/files/tsg-os-provision/templates/setup_policy_log_nic_network.sh.j2 @@ -0,0 +1,3 @@ +#!/bin/bash -ex +ifconfig eth_ctl {{ network_setting.nic_policy_log.ipv4 }} +ifconfig eth_ctl inet6 add {{ network_setting.nic_policy_log.ipv6 }} \ No newline at end of file diff --git a/ansible/roles/tsg-os-provision/tasks/main.yml b/ansible/roles/tsg-os-provision/tasks/main.yml index 2cc1098b..bdde9aca 100644 --- a/ansible/roles/tsg-os-provision/tasks/main.yml +++ b/ansible/roles/tsg-os-provision/tasks/main.yml @@ -56,9 +56,4 @@ - name: "tsg-os-provision: install yaml module using pip3" pip: name: PyYAML - executable: pip3 - -- name: template setup_policy_log_nic_network.sh.j2.j2 - template: - src: "{{ role_path }}/templates/setup_policy_log_nic_network.sh.j2.j2" - dest: /opt/tsg/tsg-os-provision/templates/setup_policy_log_nic_network.sh.j2 \ No newline at end of file + executable: pip3 \ No newline at end of file diff --git a/ansible/roles/tsg-os-provision/templates/setup_policy_log_nic_network.sh.j2.j2 b/ansible/roles/tsg-os-provision/templates/setup_policy_log_nic_network.sh.j2.j2 deleted file mode 100644 index 644234d3..00000000 --- a/ansible/roles/tsg-os-provision/templates/setup_policy_log_nic_network.sh.j2.j2 +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -ex -{% if PROFILE_ID == '7400-MCN0-P01R01' or if PROFILE_ID == '7400-MCN123-P01R01' %} -ifconfig eth_ctl {{ network_setting.nic_policy_log.ipv4 }} -ifconfig eth_ctl inet6 add {{ network_setting.nic_policy_log.ipv6 }} -{% endif %} -{% if PROFILE_ID == '9000-NPB-P01R01' %} -ifconfig enp130s2f3 {{ network_setting.nic_policy_log.ipv4 }} -ifconfig enp130s2f3 inet6 add {{ network_setting.nic_policy_log.ipv6 }} -{% endif %} \ No newline at end of file