diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-11-20 18:25:30 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-11-22 10:00:22 -0500 |
| commit | f9846a94a2ebd0f9417aeb8f9007f8acdba32b24 (patch) | |
| tree | 1c3e0a251c353e2c7de8bd54aba3475559048dc9 /roles/openshift_cli | |
| parent | 1ad44b02b99b0e0e7e69c6c25ece502f9962c6a1 (diff) | |
| download | openshift-f9846a94a2ebd0f9417aeb8f9007f8acdba32b24.tar.gz openshift-f9846a94a2ebd0f9417aeb8f9007f8acdba32b24.tar.bz2 openshift-f9846a94a2ebd0f9417aeb8f9007f8acdba32b24.tar.xz openshift-f9846a94a2ebd0f9417aeb8f9007f8acdba32b24.zip | |
Fix system_images_registry variable
Simplify the logic for this variable.
Diffstat (limited to 'roles/openshift_cli')
| -rw-r--r-- | roles/openshift_cli/defaults/main.yml | 5 | ||||
| -rw-r--r-- | roles/openshift_cli/tasks/main.yml | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/roles/openshift_cli/defaults/main.yml b/roles/openshift_cli/defaults/main.yml index ed97d539c..82da0639e 100644 --- a/roles/openshift_cli/defaults/main.yml +++ b/roles/openshift_cli/defaults/main.yml @@ -1 +1,6 @@ --- +system_images_registry_dict: + openshift-enterprise: "registry.access.redhat.com" + origin: "docker.io" + +system_images_registry: "{{ system_images_registry_dict[openshift_deployment_type | default('origin')] }}" 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: |