diff --git a/host_vars/gw11.regensburg.freifunk.net b/host_vars/gw11.regensburg.freifunk.net index df0bdeb..6e1f959 100644 --- a/host_vars/gw11.regensburg.freifunk.net +++ b/host_vars/gw11.regensburg.freifunk.net @@ -2,7 +2,6 @@ batman_ipv4: 10.90.32.11/19 batman_ipv6: fdef:f10f:1337:cafe::11/64 -batman_dkms: false batman_algo: BATMAN_IV global_ipv6: 2a00:9d80:6000:0101::11/64 nextnode4: 10.90.32.1 diff --git a/host_vars/gw21.regensburg.freifunk.net b/host_vars/gw21.regensburg.freifunk.net index c225305..3be65dc 100644 --- a/host_vars/gw21.regensburg.freifunk.net +++ b/host_vars/gw21.regensburg.freifunk.net @@ -2,7 +2,6 @@ batman_ipv4: 10.90.64.21/19 batman_ipv6: fdef:f20f:1337:cafe::21/64 -batman_dkms: false batman_algo: BATMAN_IV global_ipv6: 2a00:9d80:6000:0102::21/64 nextnode4: 10.90.64.1 diff --git a/host_vars/gw31.regensburg.freifunk.net b/host_vars/gw31.regensburg.freifunk.net index db70a3f..7519ddd 100644 --- a/host_vars/gw31.regensburg.freifunk.net +++ b/host_vars/gw31.regensburg.freifunk.net @@ -2,7 +2,6 @@ batman_ipv4: 10.90.96.31/19 batman_ipv6: fdef:f30f:1337:cafe::31/64 -batman_dkms: false batman_algo: BATMAN_IV global_ipv6: 2a00:9d80:6000:0103::31/64 nextnode4: 10.90.96.1 diff --git a/roles/batman/defaults/main.yml b/roles/batman/defaults/main.yml deleted file mode 100644 index 66c9bcf..0000000 --- a/roles/batman/defaults/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -batman-adv_version: 2017.3 -batman-adv_tar_sha256_hash: 830edd297ff11b91623e9612172db3e2b2c1524e2f9b2ca1cb243e2e3f0ba4d4 diff --git a/roles/batman/tasks/main.yml b/roles/batman/tasks/main.yml index f091e34..63e1d36 100644 --- a/roles/batman/tasks/main.yml +++ b/roles/batman/tasks/main.yml @@ -1,52 +1,7 @@ --- - name: Install batctl from apt - when: batman_dkms == false - apt: name=batctl state=latest - -- name: Install dependencies for building DKMS - when: batman_dkms == true - apt: name={{ item }} - with_items: - - build-essential - - curl - - dkms - - pkgconf - - libnl-genl-3-dev - - linux-headers-{{ ansible_kernel }} - -- name: Download batman-adv source - when: batman_dkms == true - get_url: url="https://downloads.open-mesh.org/batman/releases/batman-adv-{{ batman-adv_version }}/batman-adv-{{ batman-adv_version }}.tar.gz" - dest=/tmp/batman-adv-{{ batman-adv_version }}.tar.gz - checksum=sha256:{{ batman-adv_tar_sha256_hash }} - -- name: Unpack batman-adv source - when: batman_dkms == true - unarchive: src=/tmp/batman-adv-{{ batman-adv_version }}.tar.gz - dest=/usr/src/ - copy=no - -- name: Install dkms.conf - when: batman_dkms == true - template: src=dkms.conf.j2 - dest="/usr/src/batman-adv-{{ batman-adv_version }}/dkms.conf" - -- name: Add module via dkms - when: batman_dkms == true - command: dkms add -m batman-adv -v "{{ batman-adv_version }}" - -- name: Build module via dkms - when: batman_dkms == true - command: dkms build -m batman-adv -v "{{ batman-adv_version }}" - -- name: Install module via dkms - when: batman_dkms == true - command: dkms install -m batman-adv -v "{{ batman-adv_version }}" - -- name: Rebuild kernel initramfs - when: batman_dkms == true - command: update-initramfs -c -k all + apt: name=batctl - name: Enable batman during boot lineinfile: dest=/etc/modules line=batman-adv diff --git a/roles/batman/templates/dkms.conf.j2 b/roles/batman/templates/dkms.conf.j2 deleted file mode 100644 index 8b35fc8..0000000 --- a/roles/batman/templates/dkms.conf.j2 +++ /dev/null @@ -1,10 +0,0 @@ -PACKAGE_NAME='batman-adv' -PACKAGE_VERSION="{{ batman-adv_version }}" - -BUILT_MODULE_NAME[0]="batman-adv" -BUILT_MODULE_LOCATION[0]="build/net/batman-adv/" -DEST_MODULE_LOCATION[0]="/kernel/net/batman-adv/" -AUTOINSTALL=yes - -MAKE[0]="make KERNELPATH=${kernel_source_dir} CONFIG_BATMAN_ADV_BATMAN_V=y" -CLEAN="make KERNELPATH=${kernel_source_dir} clean"