gfwleak/tsg-tsg-os-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix:删除9140下配置日志和策略网卡的动作

Browse Source
This commit is contained in:
fumingwei
2021-06-24 19:01:39 +08:00
parent c4d0d3b757
commit 260073269f
4 changed files with 4 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.9000NPBP01R01
View File

@@ -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

3
ansible/roles/tsg-os-provision/files/tsg-os-provision/templates/setup_policy_log_nic_network.sh.j2 Normal file
View File

@@ -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 }}

7
ansible/roles/tsg-os-provision/tasks/main.yml
View File

@@ -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
executable: pip3

9
ansible/roles/tsg-os-provision/templates/setup_policy_log_nic_network.sh.j2.j2
View File

@@ -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 %}