From c39c0272ca4ec72af9b95c8c6fe448addbb5ec96 Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Wed, 29 Mar 2017 16:39:52 -0400
Subject: Wait for firewalld polkit policy to be defined

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1436964
---
 roles/os_firewall/tasks/firewall/firewalld.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/roles/os_firewall/tasks/firewall/firewalld.yml b/roles/os_firewall/tasks/firewall/firewalld.yml
index a9a69f73c..2b40eee1b 100644
--- a/roles/os_firewall/tasks/firewall/firewalld.yml
+++ b/roles/os_firewall/tasks/firewall/firewalld.yml
@@ -34,6 +34,16 @@
   pause: seconds=10
   when: result | changed
 
+# Fix suspected race between firewalld and polkit BZ1436964
+- name: Wait for polkit action to have been created
+  command: pkaction --action-id=org.fedoraproject.FirewallD1.config.info
+  ignore_errors: true
+  register: pkaction
+  changed_when: false
+  until: pkaction.rc == 0
+  retries: 6
+  delay: 10
+
 - name: Add firewalld allow rules
   firewalld:
     port: "{{ item.port }}"
-- 
cgit v1.2.3