소스 검색

Use openshift.common.hostname when verifying API port available.

Andrew Butcher 8 년 전
부모
커밋
cd9dd38ec3
2개의 변경된 파일10개의 추가작업 그리고 14개의 파일을 삭제
  1. 5 7
      playbooks/common/openshift-cluster/upgrades/docker/restart.yml
  2. 5 7
      playbooks/common/openshift-master/restart_services.yml

+ 5 - 7
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

+ 5 - 7
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: