diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-10-21 00:40:06 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-10-23 11:26:06 +0200 |
| commit | f7b290de4186f00dd51e41dfb7e9f5eb42174099 (patch) | |
| tree | 09c6adda1de2398d20d9f2a641eab3a763262b27 | |
| parent | 26a0c901536775b5a0d917d8723156cdb19f05d1 (diff) | |
| download | openshift-f7b290de4186f00dd51e41dfb7e9f5eb42174099.tar.gz openshift-f7b290de4186f00dd51e41dfb7e9f5eb42174099.tar.bz2 openshift-f7b290de4186f00dd51e41dfb7e9f5eb42174099.tar.xz openshift-f7b290de4186f00dd51e41dfb7e9f5eb42174099.zip | |
cli: use the correct name for the master system container
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| -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 4baa24027..14d8a3325 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 {{ openshift.common.system_images_registry }}/{{ openshift.common.cli_image }}:{{ openshift_image_tag }} + 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 }} 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: "{{ openshift.common.system_images_registry }}/{{ openshift.common.cli_image }}" + image: "{{ '' if openshift.common.system_images_registry == 'docker' else openshift.common.system_images_registry + '/' }}{{ openshift.common.cli_image }}" tag: "{{ openshift_image_tag }}" backend: "atomic" when: |