diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-11-27 15:50:45 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-11-27 15:53:08 -0500 |
| commit | 8db941b0bbdaef033ae4ef7fc3e7aaa3f502e07a (patch) | |
| tree | dfee5addb0d23749af27b7cea7153236329f94b7 /roles/openshift_cli/tasks | |
| parent | e7e699a4201754fe9ccd1b9adffad5be5fff18b3 (diff) | |
| download | openshift-8db941b0bbdaef033ae4ef7fc3e7aaa3f502e07a.tar.gz openshift-8db941b0bbdaef033ae4ef7fc3e7aaa3f502e07a.tar.bz2 openshift-8db941b0bbdaef033ae4ef7fc3e7aaa3f502e07a.tar.xz openshift-8db941b0bbdaef033ae4ef7fc3e7aaa3f502e07a.zip | |
Remove openshift.common.cli_image
This commit removes openshift.common.cli_image in
favor of openshift_cli_image.
Diffstat (limited to 'roles/openshift_cli/tasks')
| -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: |