diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-01-06 15:44:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-06 15:44:51 -0500 |
| commit | c2a5759ff1b6b65023b0706ec0d7561e4026e693 (patch) | |
| tree | 5b018b96564fa7d003cca0c9498a33a7dfbd22be | |
| parent | afa745c53379408955b87db91b9b29d51fabf37b (diff) | |
| parent | cd9dd38ec3d4eff4fc82704659e3628b68b046ff (diff) | |
| download | openshift-c2a5759ff1b6b65023b0706ec0d7561e4026e693.tar.gz openshift-c2a5759ff1b6b65023b0706ec0d7561e4026e693.tar.bz2 openshift-c2a5759ff1b6b65023b0706ec0d7561e4026e693.tar.xz openshift-c2a5759ff1b6b65023b0706ec0d7561e4026e693.zip | |
Merge pull request #3032 from abutcher/wait_for_api_hostname
Use openshift.common.hostname when verifying API port available.
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/docker/restart.yml | 12 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/restart_services.yml | 12 |
2 files changed, 10 insertions, 14 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/docker/restart.yml b/playbooks/common/openshift-cluster/upgrades/docker/restart.yml index d800b289b..1b418920f 100644 --- a/playbooks/common/openshift-cluster/upgrades/docker/restart.yml +++ b/playbooks/common/openshift-cluster/upgrades/docker/restart.yml @@ -19,11 +19,9 @@ when: openshift.common.is_containerized | bool - name: Wait for master API to come back online - become: no - local_action: - module: wait_for - host="{{ inventory_hostname }}" - state=started - delay=10 - port="{{ openshift.master.api_port }}" + wait_for: + host: "{{ openshift.common.hostname }}" + state: started + delay: 10 + port: "{{ openshift.master.api_port }}" when: inventory_hostname in groups.oo_masters_to_config diff --git a/playbooks/common/openshift-master/restart_services.yml b/playbooks/common/openshift-master/restart_services.yml index 25fa10450..b40c32669 100644 --- a/playbooks/common/openshift-master/restart_services.yml +++ b/playbooks/common/openshift-master/restart_services.yml @@ -10,13 +10,11 @@ state: restarted when: openshift_master_ha | bool and openshift.master.cluster_method != 'pacemaker' - name: Wait for master API to come back online - become: no - local_action: - module: wait_for - host="{{ openshift.common.hostname }}" - state=started - delay=10 - port="{{ openshift.master.api_port }}" + wait_for: + host: "{{ openshift.common.hostname }}" + state: started + delay: 10 + port: "{{ openshift.master.api_port }}" when: openshift_master_ha | bool and openshift.master.cluster_method != 'pacemaker' - name: Restart master controllers service: |