Add containerization skips

Attempt to tweak config generator to include ALL hosts that could have been included in the play, rather than just the ones matching filters (helpful for controller deployments)
2020-08-04 17:49:30 +00:00 · 2020-08-04 17:39:33 +00:00
3 changed files with 5 additions and 5 deletions
--- a/handlers/main.yml
+++ b/handlers/main.yml
@ -6,7 +6,7 @@
  loop:
  - stopped
  - started
-  when: not wg_syncconf
+  when: not wg_syncconf and not wireguard_containerized
  listen: "reconfigure wireguard"

 - name: syncconf wireguard
@ -19,5 +19,5 @@
      exit 0
  args:
    executable: "/bin/bash"
-  when: wg_syncconf
+  when: wg_syncconf and not wireguard_containerized
  listen: "reconfigure wireguard"
--- a/tasks/main.yml
+++ b/tasks/main.yml
@ -3,6 +3,7 @@
  setup:

 - include_tasks: "setup-{{ ansible_distribution|lower }}.yml"
+  when: not wireguard_containerized

 - name: Enable WireGuard kernel module
  modprobe:
@ -129,5 +130,4 @@
    name: "wg-quick@{{ wireguard_interface }}"
    state: started
    enabled: yes
-  tags:
-    - bare-metal
+  when: not wireguard_containerized
--- a/templates/wg.conf.j2
+++ b/templates/wg.conf.j2
@ -39,7 +39,7 @@ PostDown = {{ wg_postdown }}
 {% if hostvars[inventory_hostname].wireguard_save_config is defined %}
 SaveConfig = true
 {% endif %}
-{% for host in ansible_play_hosts %}
+{% for host in ansible_play_hosts_all %}
  {% if host != inventory_hostname %}
  
    [Peer]
Author	SHA1	Message	Date
KemoNine	0afb85375e	Add containerization skips	2020-08-04 17:49:30 +00:00
KemoNine	1faf8d9f12	Attempt to tweak config generator to include ALL hosts that could have been included in the play, rather than just the ones matching filters (helpful for controller deployments)	2020-08-04 17:39:33 +00:00