Browse Source

Merge branch 'master' of github.com:ffdo/ffdo-ansible

Till Klocke 9 years ago
parent
commit
f907c1e1d6

+ 0 - 4
roles/internal/ffdo.peering/tasks/debian.yml

@@ -1,4 +0,0 @@
----
-- name: Restart network
-  when: network_template_installed|changed
-  shell: "ifdown --exclude=lo --exclude={{ansible_default_ipv4.alias}} -a && ifup --exclude=lo --exclude={{ansible_default_ipv4.alias}} -a"

+ 0 - 24
roles/internal/ffdo.supernode/tasks/debian.yml

@@ -1,24 +0,0 @@
-- name: Remove resolvconf from Ubunut
-  when: ansible_distribution == 'Ubuntu'
-  apt: name=resolvconf state=absent
-
-- name: Install custom resolv.conf
-  template: src=resolv.conf.j2 dest=/etc/resolv.conf
-
-- name: Make sure necessary tools are installed
-  apt: name={{item}} state=present
-  with_items:
-  - wget
-  - ntp
-  - git
-
-- name: Install dependencies for ffrl tools
-  apt: name={{item}}
-  with_items:
-  - python3
-  - python3-pip
-
-- name: Install backport kernel for Debian wheezy
-  apt: name=linux-image-amd64 default_release=wheezy-backports state=latest
-  when: ansible_distribution_release == 'wheezy'
-  notify: Reboot machine

+ 3 - 0
roles/internal/ffdo.supernode/tasks/main.yml

@@ -4,6 +4,9 @@
 - include_vars: "{{ ansible_distribution }}-{{ansible_distribution_release }}.yml"
   when: ansible_distribution_release == 'wheezy' and ansible_distribution == 'Debian'
 
+- name: Ensure package resolvconf is absent
+  apt: name=resolvconf stage=absent purge=yes
+
 - name: Install custom resolv.conf
   template: src=resolv.conf.j2 dest=/etc/resolv.conf