diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-11-28 09:34:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-28 09:34:52 -0500 |
| commit | 34de448dd7ff5c671628092e51668aa5c89e8e74 (patch) | |
| tree | 5ccd85720b9718d0b7886b8efd1a7f4e8180c749 /playbooks | |
| parent | 374749dd54f4c111d1c2cb6044dc9f961a4f36ce (diff) | |
| parent | 8db941b0bbdaef033ae4ef7fc3e7aaa3f502e07a (diff) | |
| download | openshift-34de448dd7ff5c671628092e51668aa5c89e8e74.tar.gz openshift-34de448dd7ff5c671628092e51668aa5c89e8e74.tar.bz2 openshift-34de448dd7ff5c671628092e51668aa5c89e8e74.tar.xz openshift-34de448dd7ff5c671628092e51668aa5c89e8e74.zip | |
Merge pull request #6280 from mgugino-upstream-stage/cli_image
Remove openshift.common.cli_image
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml | 2 | ||||
| -rw-r--r-- | playbooks/init/facts.yml | 1 |
2 files changed, 1 insertions, 2 deletions
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) }}" |