From 64c6beabf8914b79b9859e4f30a72c8fc2fbbc2d Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Mon, 10 Jun 2019 15:07:34 -0400 Subject: [PATCH] Compatability with Ansible 2.2 --- roles/pvc/tasks/main.yml | 12 ++++++------ roles/pvc/tasks/patroni.yml | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/roles/pvc/tasks/main.yml b/roles/pvc/tasks/main.yml index 85aba17..880c7aa 100644 --- a/roles/pvc/tasks/main.yml +++ b/roles/pvc/tasks/main.yml @@ -4,22 +4,22 @@ src: system/blacklist.j2 dest: /etc/modprobe.d/blacklist.conf -- include_tasks: ceph.yml +- include: ceph.yml tags: pvc-ceph -- include_tasks: zookeeper.yml +- include: zookeeper.yml tags: pvc-zookeeper -- include_tasks: libvirt.yml +- include: libvirt.yml tags: pvc-libvirt -- include_tasks: frr.yml +- include: frr.yml tags: pvc-frr -- include_tasks: patroni.yml +- include: patroni.yml tags: pvc-patroni -- include_tasks: pvc.yml +- include: pvc.yml tags: pvc-pvc run_once: true delegate_to: "{{ item }}" diff --git a/roles/pvc/tasks/patroni.yml b/roles/pvc/tasks/patroni.yml index 571bec6..c56717b 100644 --- a/roles/pvc/tasks/patroni.yml +++ b/roles/pvc/tasks/patroni.yml @@ -84,8 +84,7 @@ with_items: - { src: "patroni/powerdns-schema.sql", dest: "/etc/postgresql/powerdns-schema.sql" } -- name: set up PVC DNS database on first host - block: +- block: - name: wait 15s for cluster to initialize pause: seconds: 15