diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2017-11-22 13:19:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-22 13:19:09 -0500 |
| commit | f983b99d4a4acd1e3922305190dbe854227cccc0 (patch) | |
| tree | 3f467db738e30063b564112867e897e4c16012fe /roles/openshift_cli/tasks | |
| parent | 5889d10321ced514a1a235016bc4173895065474 (diff) | |
| parent | f9846a94a2ebd0f9417aeb8f9007f8acdba32b24 (diff) | |
| download | openshift-f983b99d4a4acd1e3922305190dbe854227cccc0.tar.gz openshift-f983b99d4a4acd1e3922305190dbe854227cccc0.tar.bz2 openshift-f983b99d4a4acd1e3922305190dbe854227cccc0.tar.xz openshift-f983b99d4a4acd1e3922305190dbe854227cccc0.zip | |
Merge pull request #6201 from mgugino-upstream-stage/system-reg
Fix system_images_registry variable
Diffstat (limited to 'roles/openshift_cli/tasks')
| -rw-r--r-- | roles/openshift_cli/tasks/main.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_cli/tasks/main.yml b/roles/openshift_cli/tasks/main.yml index 14d8a3325..06dc5d14b 100644 --- a/roles/openshift_cli/tasks/main.yml +++ b/roles/openshift_cli/tasks/main.yml @@ -28,13 +28,13 @@ - block: - name: Pull CLI Image command: > - atomic pull --storage ostree {{ 'docker:' if openshift.common.system_images_registry == 'docker' else openshift.common.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.common.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 openshift.common.system_images_registry == 'docker' else openshift.common.system_images_registry + '/' }}{{ openshift.common.cli_image }}" + image: "{{ '' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ openshift.common.cli_image }}" tag: "{{ openshift_image_tag }}" backend: "atomic" when: |