Bug 1758744: Fix upgrade not respecting openshift_pkg_version

playbooks/openshift-master/private/upgrade.yml

@@ -161,7 +161,6 @@
 - name: Reconcile Cluster Roles and Cluster Role Bindings and Security Context Constraints
   hosts: oo_masters_to_config
   roles:
-  - openshift_cli
   - openshift_facts
   vars:
     __master_shared_resource_viewer_file: "shared_resource_viewer_role.yaml"

roles/openshift_ca/README.md

@@ -25,7 +25,6 @@ Dependencies
 ------------
 
 * openshift_repos
-* openshift_cli
 
 Example Playbook
 ----------------

roles/openshift_ca/meta/main.yml

@@ -13,6 +13,5 @@ galaxy_info:
   - cloud
   - system
 dependencies:
-- role: openshift_cli
 - role: openshift_facts
 - role: lib_utils

roles/openshift_node/tasks/install.yml

@@ -12,3 +12,23 @@
     - conntrack-tools
   when:
   - not openshift_is_atomic | bool
+
+- when: openshift_is_atomic | bool
+  block:
+  - name: Pull CLI Image (docker)
+    docker_image:
+      name: "{{ openshift_cli_image }}"
+    when: not openshift_use_crio_only | bool
+
+  - name: Pull CLI Image (atomic)
+    command: >
+      atomic pull --storage ostree {{ system_openshift_cli_image }}
+    register: pull_result
+    changed_when: "'Pulling layer' in pull_result.stdout"
+    when: openshift_use_crio_only | bool
+
+  # openshift_container_binary_sync is a custom module in lib_utils
+  - name: Copy client binaries/symlinks out of CLI image for use on the host
+    openshift_container_binary_sync:
+      image: "{{ openshift_cli_image }}"
+      backend: "{{ (openshift_use_crio_only | bool) | ternary('atomic', 'docker') }}"