From b7fd16cc816c9303a0c5578833c4e8080fae6193 Mon Sep 17 00:00:00 2001 From: Asara Date: Tue, 27 Oct 2020 01:31:13 -0400 Subject: [PATCH] Fixes for consul, update podman --- ansible/group_vars/all/main.yml | 2 +- ansible/roles/consul_server/handlers/main.yml | 5 ----- ansible/roles/consul_server/tasks/Debian.yml | 2 +- ansible/roles/consul_server/tasks/FreeBSD.yml | 1 - 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ansible/group_vars/all/main.yml b/ansible/group_vars/all/main.yml index acc855b..4a4f917 100644 --- a/ansible/group_vars/all/main.yml +++ b/ansible/group_vars/all/main.yml @@ -60,5 +60,5 @@ nomad_version: 0.12.5 nomad_podman_driver_version: 0.1.0 # podman -podman_version: 2.0.6+dfsg1-1 +podman_version: 2.0.6+dfsg1-2 ... diff --git a/ansible/roles/consul_server/handlers/main.yml b/ansible/roles/consul_server/handlers/main.yml index 1251682..b2523bf 100644 --- a/ansible/roles/consul_server/handlers/main.yml +++ b/ansible/roles/consul_server/handlers/main.yml @@ -8,11 +8,6 @@ name: consul state: reloaded -- name: reload_consul_fbsd - service: - name: consul - state: reloaded - - name: restart_consul_debian systemd: name: consul diff --git a/ansible/roles/consul_server/tasks/Debian.yml b/ansible/roles/consul_server/tasks/Debian.yml index 75cde48..623e7a0 100644 --- a/ansible/roles/consul_server/tasks/Debian.yml +++ b/ansible/roles/consul_server/tasks/Debian.yml @@ -47,7 +47,7 @@ VAULT_FORMAT: json register: cert_data when: exp.rc != 0 - notify: reload_consul + notify: reload_consul_debian - name: write cert data to server copy: diff --git a/ansible/roles/consul_server/tasks/FreeBSD.yml b/ansible/roles/consul_server/tasks/FreeBSD.yml index d7301d7..830586c 100644 --- a/ansible/roles/consul_server/tasks/FreeBSD.yml +++ b/ansible/roles/consul_server/tasks/FreeBSD.yml @@ -47,7 +47,6 @@ VAULT_FORMAT: json register: cert_data when: exp.rc != 0 - notify: reload_consul - name: write cert data to server copy: