diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-15 15:20:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-15 15:20:15 -0700 |
| commit | 2747d1f1458e33979658f0075bbebab5c3cb6b34 (patch) | |
| tree | e6a270abad69d2fc6fa0fc4718b3e49e684a3e1e | |
| parent | 87449eed97d4a4320a08706f071192853961535f (diff) | |
| parent | fbe584a902a10214270cf7060d60aaa911e7ffa7 (diff) | |
| download | openshift-2747d1f1458e33979658f0075bbebab5c3cb6b34.tar.gz openshift-2747d1f1458e33979658f0075bbebab5c3cb6b34.tar.bz2 openshift-2747d1f1458e33979658f0075bbebab5c3cb6b34.tar.xz openshift-2747d1f1458e33979658f0075bbebab5c3cb6b34.zip | |
Merge pull request #5407 from sdodson/bz1490739
Automatic merge from submit-queue
Only attempt to start iptables on hosts in the current batch
If os_firewall role is called from within a play that uses serial then
it was attempting to start iptables on hosts that may not have had
iptables installed on them yet. So limit the hosts to the current batch.
According to the ansible docs on plays where serial is unused this is
the same as ansible_play_hosts.
See http://docs.ansible.com/ansible/latest/playbooks_variables.html
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1490739
| -rw-r--r-- | roles/os_firewall/tasks/iptables.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/os_firewall/tasks/iptables.yml b/roles/os_firewall/tasks/iptables.yml index 0af5abf38..2d74f2e48 100644 --- a/roles/os_firewall/tasks/iptables.yml +++ b/roles/os_firewall/tasks/iptables.yml @@ -33,7 +33,7 @@ register: result delegate_to: "{{item}}" run_once: true - with_items: "{{ ansible_play_hosts }}" + with_items: "{{ ansible_play_batch }}" - name: need to pause here, otherwise the iptables service starting can sometimes cause ssh to fail pause: |