diff options
| -rw-r--r-- | ansible/production | 6 | ||||
| -rw-r--r-- | ansible/roles/common/tasks/main.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/network/handlers/main.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/network/tasks/main.yml | 8 |
4 files changed, 9 insertions, 17 deletions
diff --git a/ansible/production b/ansible/production index e1f0332..c8f08f2 100644 --- a/ansible/production +++ b/ansible/production @@ -1,4 +1,4 @@ [cluster_nodes] -veterini ansible_host=fbx-rennes2.machine.deuxfleurs.fr ansible_port=110 ansible_user=root public_ip=192.168.1.2 private_ip=192.168.1.2 interface=eno1 dns_server=208.67.222.222 -silicareux ansible_host=fbx-rennes2.machine.deuxfleurs.fr ansible_port=111 ansible_user=root public_ip=192.168.1.3 private_ip=192.168.1.3 interface=eno1 dns_server=208.67.222.222 -wonse ansible_host=fbx-rennes2.machine.deuxfleurs.fr ansible_port=112 ansible_user=root public_ip=192.168.1.4 private_ip=192.168.1.4 interface=eno1 dns_server=208.67.222.222 +veterini ansible_host=fbx-rennes2.machine.deuxfleurs.fr ansible_port=110 ansible_user=root public_ip=192.168.1.2 private_ip=192.168.1.2 interface=eno1 dns_server=80.67.169.40 +silicareux ansible_host=fbx-rennes2.machine.deuxfleurs.fr ansible_port=111 ansible_user=root public_ip=192.168.1.3 private_ip=192.168.1.3 interface=eno1 dns_server=80.67.169.40 +wonse ansible_host=fbx-rennes2.machine.deuxfleurs.fr ansible_port=112 ansible_user=root public_ip=192.168.1.4 private_ip=192.168.1.4 interface=eno1 dns_server=80.67.169.40 diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml index b4d00bb..0b15790 100644 --- a/ansible/roles/common/tasks/main.yml +++ b/ansible/roles/common/tasks/main.yml @@ -12,6 +12,12 @@ autoclean: yes autoremove: yes +- name: "Remove base tools" + apt: + name: + - systemd-resolved + state: absent + - name: "Install base tools" apt: name: diff --git a/ansible/roles/network/handlers/main.yml b/ansible/roles/network/handlers/main.yml deleted file mode 100644 index 1c72d85..0000000 --- a/ansible/roles/network/handlers/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: reload iptables - shell: iptables-restore < /etc/iptables/rules.v4 && systemctl restart docker - -- name: reload ip6tables - shell: ip6tables-restore < /etc/iptables/rules.v6 diff --git a/ansible/roles/network/tasks/main.yml b/ansible/roles/network/tasks/main.yml index ee2f21e..e0cf60c 100644 --- a/ansible/roles/network/tasks/main.yml +++ b/ansible/roles/network/tasks/main.yml @@ -1,12 +1,8 @@ - name: "Deploy iptablesv4 configuration" template: src=rules.v4.j2 dest=/etc/iptables/rules.v4 - notify: - - reload iptables - name: "Deploy iptablesv6 configuration" copy: src=rules.v6 dest=/etc/iptables/rules.v6 - notify: - - reload ip6tables - name: "Activate IP forwarding" sysctl: @@ -14,10 +10,6 @@ value: 1 sysctl_set: yes -- name: "Flush handlers" - meta: flush_handlers - - # These two lines are used to undo previous config, remove them once it is done - name: "Update nsswitch.conf to not use systemd-resolved" copy: src=nsswitch.conf dest=/etc/nsswitch.conf |