diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-12-19 07:39:22 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-19 07:39:22 -0800 |
| commit | 7ab8e67bfc62e16466e3fd211fded63f16583403 (patch) | |
| tree | 5d4d5ea3182a4ad089267010d0fc267fde5043b4 /roles/openshift_master/tasks | |
| parent | f119b7c15b10e9d20b5fb9d234c7cd2e54b402e6 (diff) | |
| parent | 313b15fb2668cbe6738802f913a9caa6203083b2 (diff) | |
| download | openshift-7ab8e67bfc62e16466e3fd211fded63f16583403.tar.gz openshift-7ab8e67bfc62e16466e3fd211fded63f16583403.tar.bz2 openshift-7ab8e67bfc62e16466e3fd211fded63f16583403.tar.xz openshift-7ab8e67bfc62e16466e3fd211fded63f16583403.zip | |
Merge pull request #6515 from mgugino-upstream-stage/defacting
Automatic merge from submit-queue.
Remove some small items from openshift_facts
Remove some small items from openshift_facts that
don't need to be there.
Diffstat (limited to 'roles/openshift_master/tasks')
| -rw-r--r-- | roles/openshift_master/tasks/system_container.yml | 6 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/systemd_units.yml | 2 |
2 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 f6c5ce0dd..dcbf7fd9f 100644 --- a/roles/openshift_master/tasks/system_container.yml +++ b/roles/openshift_master/tasks/system_container.yml @@ -2,7 +2,7 @@ - name: Pre-pull master system container image command: > - atomic pull --storage=ostree {{ 'docker:' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ openshift.master.master_system_image }}:{{ openshift_image_tag }} + atomic pull --storage=ostree {{ 'docker:' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ osm_image }}:{{ openshift_image_tag }} register: l_pull_result changed_when: "'Pulling layer' in l_pull_result.stdout" @@ -14,7 +14,7 @@ - name: Install or Update HA api master system container oc_atomic_container: name: "{{ openshift_service_type }}-master-api" - image: "{{ 'docker:' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ openshift.master.master_system_image }}:{{ openshift_image_tag }}" + image: "{{ 'docker:' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ osm_image }}:{{ openshift_image_tag }}" state: latest values: - COMMAND=api @@ -22,7 +22,7 @@ - name: Install or Update HA controller master system container oc_atomic_container: name: "{{ openshift_service_type }}-master-controllers" - image: "{{ 'docker:' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ openshift.master.master_system_image }}:{{ openshift_image_tag }}" + image: "{{ 'docker:' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ osm_image }}:{{ openshift_image_tag }}" state: latest values: - COMMAND=controllers diff --git a/roles/openshift_master/tasks/systemd_units.yml b/roles/openshift_master/tasks/systemd_units.yml index 1c9ecafaa..906ecf277 100644 --- a/roles/openshift_master/tasks/systemd_units.yml +++ b/roles/openshift_master/tasks/systemd_units.yml @@ -30,7 +30,7 @@ # This is the image used for both HA and non-HA clusters: - name: Pre-pull master image command: > - docker pull {{ openshift.master.master_image }}:{{ openshift_image_tag }} + docker pull {{ osm_image }}:{{ openshift_image_tag }} register: l_pull_result changed_when: "'Downloaded newer image' in l_pull_result.stdout" when: |