diff options
Diffstat (limited to 'roles/firewall')
| -rw-r--r-- | roles/firewall/tasks/main.yml | 1 | ||||
| -rw-r--r-- | roles/firewall/templates/capture_packet_plug.conf.j2 | 4 | ||||
| -rw-r--r-- | roles/firewall/templates/main.conf.j2 | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/roles/firewall/tasks/main.yml b/roles/firewall/tasks/main.yml index 6668dab..a6c4c00 100644 --- a/roles/firewall/tasks/main.yml +++ b/roles/firewall/tasks/main.yml @@ -8,6 +8,7 @@ yum: name: "{{ fw_packages }}" state: present + skip_broken: yes vars: fw_packages: - /tmp/ansible_deploy/dns-2.0.2.5effe72-2.el7.x86_64.rpm diff --git a/roles/firewall/templates/capture_packet_plug.conf.j2 b/roles/firewall/templates/capture_packet_plug.conf.j2 index 9cd6d10..6da4c3c 100644 --- a/roles/firewall/templates/capture_packet_plug.conf.j2 +++ b/roles/firewall/templates/capture_packet_plug.conf.j2 @@ -15,8 +15,8 @@ INC_CFG_DIR=capture_packet_rule/inc/index/ FULL_CFG_DIR=capture_packet_rule/full/index/
[LOG]
-{% if tsg_running_type == 0 %}
-NIC_NAME={{ tsg_tun_mode.ethname }}
+{% if tsg_running_type == 0 or 1 %}
+NIC_NAME={{ server.ethname }}
{% else %}
NIC_NAME={{ nic_mgr.name }}
{% endif %}
diff --git a/roles/firewall/templates/main.conf.j2 b/roles/firewall/templates/main.conf.j2 index 9077021..9cbaec8 100644 --- a/roles/firewall/templates/main.conf.j2 +++ b/roles/firewall/templates/main.conf.j2 @@ -24,8 +24,8 @@ IP_ADDR_TABLE=TSG_SECURITY_ADDR [TSG_LOG] MODE=1 -{% if tsg_running_type == 0 %} -NIC_NAME={{ tsg_tun_mode.ethname }} +{% if tsg_running_type == 0 or 1 %} +NIC_NAME={{ server.ethname }} {% else %} NIC_NAME={{ nic_mgr.name }} {% endif %} |