From 8db941b0bbdaef033ae4ef7fc3e7aaa3f502e07a Mon Sep 17 00:00:00 2001
From: Michael Gugino <mgugino@redhat.com>
Date: Mon, 27 Nov 2017 15:50:45 -0500
Subject: Remove openshift.common.cli_image

This commit removes openshift.common.cli_image in
favor of openshift_cli_image.
---
 .../common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml    | 2 +-
 playbooks/init/facts.yml                                                | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'playbooks')

diff --git a/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml b/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml
index 13fa37b09..446f315d6 100644
--- a/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml
+++ b/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml
@@ -12,7 +12,7 @@
 
 - name: Verify containers are available for upgrade
   command: >
-    docker pull {{ openshift.common.cli_image }}:{{ openshift_image_tag }}
+    docker pull {{ openshift_cli_image }}:{{ openshift_image_tag }}
   register: pull_result
   changed_when: "'Downloaded newer image' in pull_result.stdout"
   when: openshift.common.is_containerized | bool
diff --git a/playbooks/init/facts.yml b/playbooks/init/facts.yml
index 820561b2b..05142f9b6 100644
--- a/playbooks/init/facts.yml
+++ b/playbooks/init/facts.yml
@@ -107,7 +107,6 @@
       local_facts:
         deployment_type: "{{ openshift_deployment_type }}"
         deployment_subtype: "{{ openshift_deployment_subtype | default(None) }}"
-        cli_image: "{{ osm_image | default(None) }}"
         hostname: "{{ openshift_hostname | default(None) }}"
         ip: "{{ openshift_ip | default(None) }}"
         is_containerized: "{{ l_is_containerized | default(None) }}"
-- 
cgit v1.2.3