2 files changed, 15 insertions, 25 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index 308a8959d..933fd584d 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -20,17 +20,6 @@
         annotations: "{{ openshift_node_annotations | default(None) }}"
         schedulable: "{{ openshift_schedulable | default(openshift_scheduleable) | default(None) }}"
 
-- name: Create temp directory for syncing certs
-  hosts: localhost
-  connection: local
-  become: no
-  gather_facts: no
-  tasks:
-  - name: Create local temp directory for syncing certs
-    local_action: command mktemp -d /tmp/openshift-ansible-XXXXXXX
-    register: mktemp
-    changed_when: False
-
 - name: Evaluate node groups
   hosts: localhost
   become: no
@@ -102,12 +91,3 @@
   - name: Create group for deployment type
     group_by: key=oo_nodes_deployment_type_{{ openshift.common.deployment_type }}
     changed_when: False
-
-- name: Delete temporary directory on localhost
-  hosts: localhost
-  connection: local
-  become: no
-  gather_facts: no
-  tasks:
-  - file: name={{ mktemp.stdout }} state=absent
-    changed_when: False
diff --git a/playbooks/common/openshift-node/restart.yml b/playbooks/common/openshift-node/restart.yml
index 6e9b1cca3..441b100e9 100644
--- a/playbooks/common/openshift-node/restart.yml
+++ b/playbooks/common/openshift-node/restart.yml
@@ -2,16 +2,24 @@
 - name: Restart nodes
   hosts: oo_nodes_to_config
   serial: "{{ openshift_restart_nodes_serial | default(1) }}"
+
+  roles:
+  - lib_openshift
+
   tasks:
   - name: Restart docker
-    service: name=docker state=restarted
+    service:
+      name: docker
+      state: restarted
 
   - name: Update docker facts
     openshift_facts:
       role: docker
 
   - name: Restart containerized services
-    service: name={{ item }} state=started
+    service:
+      name: "{{ item }}"
+      state: started
     with_items:
     - etcd_container
     - openvswitch
@@ -36,12 +44,14 @@
       state: restarted
 
   - name: Wait for node to be ready
-    command: >
-      {{ hostvars[groups.oo_first_master.0].openshift.common.client_binary }} get node {{ openshift.common.hostname | lower }} --no-headers
+    oc_obj:
+      state: list
+      kind: node
+      name: "{{ openshift.common.hostname | lower }}"
     register: node_output
     delegate_to: "{{ groups.oo_first_master.0 }}"
     when: inventory_hostname in groups.oo_nodes_to_config
-    until: "{{ node_output.stdout.split()[1].startswith('Ready')}}"
+    until: node_output.results.results[0].status.conditions | selectattr('type', 'match', '^Ready$') | map(attribute='status') | join | bool == True
     # Give the node two minutes to come back online.
     retries: 24
     delay: 5