From 5132062bf740337465b46b879d164f234bbad846 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sun, 5 Nov 2017 14:19:23 -0600 Subject: [PATCH] install iptables in 2-common --- roles/2-common/tasks/main.yml | 7 +------ roles/network/tasks/iptables.yml | 6 +++--- roles/network/tasks/main.yml | 4 ---- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/roles/2-common/tasks/main.yml b/roles/2-common/tasks/main.yml index c23b33521..0e09e2514 100644 --- a/roles/2-common/tasks/main.yml +++ b/roles/2-common/tasks/main.yml @@ -11,12 +11,7 @@ - include_tasks: xo.yml when: xo_model != "none" or osbuilder is defined -# set FQDN for IIAB -#- include_tasks: hostname.yml -# tags: -# - network -# - domain -# - hostname +- include_tasks: roles/network/tasks/iptables.yml - include_tasks: centos.yml when: ansible_distribution == "CentOS" diff --git a/roles/network/tasks/iptables.yml b/roles/network/tasks/iptables.yml index 25ded7d8c..0025fab99 100644 --- a/roles/network/tasks/iptables.yml +++ b/roles/network/tasks/iptables.yml @@ -47,10 +47,10 @@ group='root' mode={{ item.2 }} with_items: - - { 0: 'gateway/iptables-config', 1: '/etc/sysconfig/iptables-config', 2: '0644' } - - { 0: 'gateway/check-LAN', 1: '/usr/bin/check-LAN', 2: '0755' } + - { 0: 'roles/network/templates/gateway/iptables-config', 1: '/etc/sysconfig/iptables-config', 2: '0644' } + - { 0: 'roles/network/templates/gateway/check-LAN', 1: '/usr/bin/check-LAN', 2: '0755' } - name: Install Debian config - template: src=gateway/iptables dest=/etc/network/if-pre-up.d/iptables + template: src=roles/network/templates/gateway/iptables dest=/etc/network/if-pre-up.d/iptables mode=0755 when: is_debuntu diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index e4a8880b8..675dd805c 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -25,10 +25,6 @@ - hostname - domain -- include_tasks: iptables.yml - tags: - - network - #### start services - include_tasks: avahi.yml tags: