diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2017-12-08 09:52:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-08 09:52:15 -0500 |
| commit | 0f98871d0f4cf39eded2fcd6041fcea4f83bbed6 (patch) | |
| tree | dd4269d8cd6d4f8beb4becea8a883716e6081f13 /roles/openshift_master/tasks/system_container.yml | |
| parent | 2af8419bab887c8552337333023ce357b1a18bc0 (diff) | |
| parent | eb6b20fc9183cc2aae424c72efd1191b99110a93 (diff) | |
| download | openshift-0f98871d0f4cf39eded2fcd6041fcea4f83bbed6.tar.gz openshift-0f98871d0f4cf39eded2fcd6041fcea4f83bbed6.tar.bz2 openshift-0f98871d0f4cf39eded2fcd6041fcea4f83bbed6.tar.xz openshift-0f98871d0f4cf39eded2fcd6041fcea4f83bbed6.zip | |
Merge pull request #6278 from mgugino-upstream-stage/service_type
Remove openshift.common.service_type
Diffstat (limited to 'roles/openshift_master/tasks/system_container.yml')
| -rw-r--r-- | roles/openshift_master/tasks/system_container.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_master/tasks/system_container.yml b/roles/openshift_master/tasks/system_container.yml index 450f6d803..f6c5ce0dd 100644 --- a/roles/openshift_master/tasks/system_container.yml +++ b/roles/openshift_master/tasks/system_container.yml @@ -8,12 +8,12 @@ - name: Check Master system container package command: > - atomic containers list --no-trunc -a -f container={{ openshift.common.service_type }}-master + atomic containers list --no-trunc -a -f container={{ openshift_service_type }}-master # HA - name: Install or Update HA api master system container oc_atomic_container: - name: "{{ openshift.common.service_type }}-master-api" + 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 }}" state: latest values: @@ -21,7 +21,7 @@ - name: Install or Update HA controller master system container oc_atomic_container: - name: "{{ openshift.common.service_type }}-master-controllers" + 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 }}" state: latest values: |