diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-08-04 15:36:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-04 15:36:15 +0200 |
| commit | bdcf0cc6a0213036656da8573d6e62e28b08e1f9 (patch) | |
| tree | f57e19833c95f5f5df07c8f200462ab5eed5e0ec /roles/openshift_master | |
| parent | 05a9c91735cc95457411dbb19951341e5418df18 (diff) | |
| parent | b7aea29e16018b2c52b80340a5a6ee8742507f01 (diff) | |
| download | openshift-bdcf0cc6a0213036656da8573d6e62e28b08e1f9.tar.gz openshift-bdcf0cc6a0213036656da8573d6e62e28b08e1f9.tar.bz2 openshift-bdcf0cc6a0213036656da8573d6e62e28b08e1f9.tar.xz openshift-bdcf0cc6a0213036656da8573d6e62e28b08e1f9.zip | |
Merge pull request #4789 from ingvagabund/allow-to-specify-docker-registry-for-system-containers
Allow to specify docker registry for system containers
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/tasks/system_container.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_master/tasks/system_container.yml b/roles/openshift_master/tasks/system_container.yml index 8f77d40ce..9944682cc 100644 --- a/roles/openshift_master/tasks/system_container.yml +++ b/roles/openshift_master/tasks/system_container.yml @@ -1,7 +1,7 @@ --- - name: Pre-pull master system container image command: > - atomic pull --storage=ostree {{ openshift.common.system_images_registry }}/{{ openshift.master.master_system_image }}:{{ openshift_image_tag }} + atomic pull --storage=ostree {{ 'docker:' if openshift.common.system_images_registry == 'docker' else openshift.common.system_images_registry + '/' }}{{ openshift.master.master_system_image }}:{{ openshift_image_tag }} register: pull_result changed_when: "'Pulling layer' in pull_result.stdout" @@ -13,7 +13,7 @@ - name: Install or Update master system container oc_atomic_container: name: "{{ openshift.common.service_type }}-master" - image: "{{ openshift.common.system_images_registry }}/{{ openshift.master.master_system_image }}:{{ openshift_image_tag }}" + image: "{{ 'docker:' if openshift.common.system_images_registry == 'docker' else openshift.common.system_images_registry + '/' }}{{ openshift.master.master_system_image }}:{{ openshift_image_tag }}" state: latest when: - not l_is_ha @@ -22,7 +22,7 @@ - name: Install or Update HA api master system container oc_atomic_container: name: "{{ openshift.common.service_type }}-master-api" - image: "{{ openshift.common.system_images_registry }}/{{ openshift.master.master_system_image }}:{{ openshift_image_tag }}" + image: "{{ 'docker:' if openshift.common.system_images_registry == 'docker' else openshift.common.system_images_registry + '/' }}{{ openshift.master.master_system_image }}:{{ openshift_image_tag }}" state: latest values: - COMMAND=api @@ -32,7 +32,7 @@ - name: Install or Update HA controller master system container oc_atomic_container: name: "{{ openshift.common.service_type }}-master-controllers" - image: "{{ openshift.common.system_images_registry }}/{{ openshift.master.master_system_image }}:{{ openshift_image_tag }}" + image: "{{{ 'docker:' if openshift.common.system_images_registry == 'docker' else openshift.common.system_images_registry + '/' }}{ openshift.master.master_system_image }}:{{ openshift_image_tag }}" state: latest values: - COMMAND=controllers |