summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-03-30 18:56:00 -0500
committerGitHub <noreply@github.com>2017-03-30 18:56:00 -0500
commit1f922786305162fc9465a733e744ee440e50f70b (patch)
treeba45830204b034ceea84b37260f194f89e08daea
parent929d0b74b88b98d9ab339185807292b7f102f6f6 (diff)
parentc39c0272ca4ec72af9b95c8c6fe448addbb5ec96 (diff)
downloadopenshift-1f922786305162fc9465a733e744ee440e50f70b.tar.gz
openshift-1f922786305162fc9465a733e744ee440e50f70b.tar.bz2
openshift-1f922786305162fc9465a733e744ee440e50f70b.tar.xz
openshift-1f922786305162fc9465a733e744ee440e50f70b.zip
Merge pull request #3804 from sdodson/bz1436964
Merged by openshift-bot
-rw-r--r--roles/os_firewall/tasks/firewall/firewalld.yml10
1 files changed, 10 insertions, 0 deletions
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 }}"