From 8f8184f4cf2d341f7d2697427e696c724eeeefa0 Mon Sep 17 00:00:00 2001 From: Tobias Hachmer Date: Wed, 7 Nov 2018 15:20:18 +0100 Subject: [PATCH] Introduce boolean var 'debug_fastd' and tag debug If debug_fastd to 'True' log level is set to debug on all fastd instances. Run the playbook with tag 'debug' to invoke only tasks changing debug settings. --- inventory/group_vars/all | 2 ++ roles/service-fastd-backbone/tasks/main.yml | 1 + roles/service-fastd-backbone/templates/fastd-backbone.conf.j2 | 4 ++++ roles/service-fastd-mesh/tasks/main.yml | 1 + roles/service-fastd-mesh/templates/fastd-mesh.conf.j2 | 4 ++++ 5 files changed, 12 insertions(+) diff --git a/inventory/group_vars/all b/inventory/group_vars/all index 3ec1c6d..b4f3e3d 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -1,4 +1,6 @@ --- +debug_fastd: False + as_private_mwu: 65037 as_public_ffrl: 201701 diff --git a/roles/service-fastd-backbone/tasks/main.yml b/roles/service-fastd-backbone/tasks/main.yml index e3841ed..a88c5ea 100644 --- a/roles/service-fastd-backbone/tasks/main.yml +++ b/roles/service-fastd-backbone/tasks/main.yml @@ -32,6 +32,7 @@ dest: "/etc/fastd/{{ item.0.id }}igvpn-{{ item.1.mtu }}/fastd.conf" notify: restart fastd backbone instances loop: "{{ meshes | subelements('fastd.backbone.instances') }}" + tags: debug - name: write fastd backbone secret template: diff --git a/roles/service-fastd-backbone/templates/fastd-backbone.conf.j2 b/roles/service-fastd-backbone/templates/fastd-backbone.conf.j2 index b7945eb..9f96987 100644 --- a/roles/service-fastd-backbone/templates/fastd-backbone.conf.j2 +++ b/roles/service-fastd-backbone/templates/fastd-backbone.conf.j2 @@ -1,7 +1,11 @@ # # {{ ansible_managed }} # +{% if debug_fastd %} +log level debug; +{% else %} log level warn; +{% endif %} hide ip addresses yes; hide mac addresses yes; diff --git a/roles/service-fastd-mesh/tasks/main.yml b/roles/service-fastd-mesh/tasks/main.yml index 56a9939..70c224c 100644 --- a/roles/service-fastd-mesh/tasks/main.yml +++ b/roles/service-fastd-mesh/tasks/main.yml @@ -52,6 +52,7 @@ dest: "/etc/fastd/{{ item.0.id }}vpn-{{ item.1.mtu }}/fastd.conf" notify: restart fastd mesh instances loop: "{{ meshes | subelements('fastd.nodes.instances') }}" + tags: debug - name: write fastd mesh secret template: diff --git a/roles/service-fastd-mesh/templates/fastd-mesh.conf.j2 b/roles/service-fastd-mesh/templates/fastd-mesh.conf.j2 index bcee23f..542c62a 100644 --- a/roles/service-fastd-mesh/templates/fastd-mesh.conf.j2 +++ b/roles/service-fastd-mesh/templates/fastd-mesh.conf.j2 @@ -1,7 +1,11 @@ # # {{ ansible_managed }} # +{% if debug_fastd %} +log level debug; +{% else %} log level warn; +{% endif %} hide ip addresses yes; hide mac addresses yes;