Revert "openshift_monitor_availability: use oc_obj and oc_process"

This reverts commit 0cd0e221e06f988efa636e7fb1060aa814f29873.

roles/openshift_monitor_availability/tasks/install.yaml

@@ -15,38 +15,21 @@
     src: "{{ role_path }}/files/"
     dest: "{{ mktemp.stdout }}"
 
+- name: Copy admin client config
+  copy:
+    src: "{{ openshift.common.config_base }}/master/admin.kubeconfig"
+    dest: "{{ mktemp.stdout }}/admin.kubeconfig"
+    remote_src: yes
+
 - name: Ensure Prometheus role exists
-  oc_obj:
-    name: prometheus-k8s
-    namespace: openshift-monitor-availability
-    kind: Role
-    state: present
-    - "{{ mktemp.stdout }}/prometheus-k8s-role.yaml"
+  command: >
+    {{ openshift_client_binary }} apply --config={{ mktemp.stdout }}/admin.kubeconfig -f {{ mktemp.stdout }}/prometheus-k8s-role.yaml
 
 - name: Ensure Prometheus role binding exists
-  oc_obj:
-    name: prometheus-k8s
-    namespace: openshift-monitor-availability
-    kind: RoleBinding
-    state: present
-    - "{{ mktemp.stdout }}/prometheus-k8s-role-binding.yaml"
-
-- name: Create Monitor app template
-  oc_obj:
-    name: openshift-monitor-app-create
-    namespace: openshift-monitor-availability
-    kind: Template
-    state: present
-    - "{{ mktemp.stdout }}/monitor-app-create.yaml"
+  command: >
+    {{ openshift_client_binary }} apply --config={{ mktemp.stdout }}/admin.kubeconfig -f {{ mktemp.stdout }}/prometheus-k8s-role-binding.yaml
 
-- name: Create Monitor app
-    namespace: openshift-monitor-availability
-    template_name: openshift-monitor-app-create
-    params:
-      IMAGE: "{{ openshift_monitor_app_create_image }}"
-      RUN_INTERVAL: "{{ openshift_monitor_app_create_run_interval }}"
-      TIMEOUT: "{{ openshift_monitor_app_create_timeout }}"
-      LOG_LEVEL: "{{ openshift_monitor_app_create_log_level }}"
+- import_tasks: install_monitor_app_create.yaml
 
 - name: Delete temp directory
   file:

roles/openshift_monitor_availability/tasks/install_monitor_app_create.yaml

@@ -0,0 +1,9 @@
+---
+- name: Apply the app template
+  shell: >
+    {{ openshift_client_binary }} process -f "{{ mktemp.stdout }}/monitor-app-create.yaml"
+    --param IMAGE="{{ openshift_monitor_app_create_image }}"
+    --param RUN_INTERVAL="{{ openshift_monitor_app_create_run_interval }}"
+    --param TIMEOUT="{{ openshift_monitor_app_create_timeout }}"
+    --param LOG_LEVEL="{{ openshift_monitor_app_create_log_level }}"
+    | {{ openshift_client_binary }} apply --config={{ mktemp.stdout }}/admin.kubeconfig -f -