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 /roles/openshift_cli | |
| 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 'roles/openshift_cli')
| -rw-r--r-- | roles/openshift_cli/tasks/main.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_cli/tasks/main.yml b/roles/openshift_cli/tasks/main.yml index 06dc5d14b..6aa15d568 100644 --- a/roles/openshift_cli/tasks/main.yml +++ b/roles/openshift_cli/tasks/main.yml @@ -12,13 +12,13 @@ - block: - name: Pull CLI Image 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" - name: Copy client binaries/symlinks out of CLI image for use on the host openshift_container_binary_sync: - image: "{{ openshift.common.cli_image }}" + image: "{{ openshift_cli_image }}" tag: "{{ openshift_image_tag }}" backend: "docker" when: @@ -28,13 +28,13 @@ - block: - name: Pull CLI Image command: > - atomic pull --storage ostree {{ 'docker:' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ openshift.common.cli_image }}:{{ openshift_image_tag }} + atomic pull --storage ostree {{ 'docker:' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ openshift_cli_image }}:{{ openshift_image_tag }} register: pull_result changed_when: "'Pulling layer' in pull_result.stdout" - name: Copy client binaries/symlinks out of CLI image for use on the host openshift_container_binary_sync: - image: "{{ '' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ openshift.common.cli_image }}" + image: "{{ '' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ openshift_cli_image }}" tag: "{{ openshift_image_tag }}" backend: "atomic" when: |