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_node/tasks/upgrade.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_node/tasks/upgrade.yml')
-rw-r--r-- | roles/openshift_node/tasks/upgrade.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/roles/openshift_node/tasks/upgrade.yml b/roles/openshift_node/tasks/upgrade.yml index 561b56918..9f333645a 100644 --- a/roles/openshift_node/tasks/upgrade.yml +++ b/roles/openshift_node/tasks/upgrade.yml @@ -17,7 +17,7 @@ name: "{{ item }}" state: stopped with_items: - - "{{ openshift.common.service_type }}-node" + - "{{ openshift_service_type }}-node" - openvswitch failed_when: false @@ -26,8 +26,8 @@ name: "{{ item }}" state: stopped with_items: - - "{{ openshift.common.service_type }}-master-controllers" - - "{{ openshift.common.service_type }}-master-api" + - "{{ openshift_service_type }}-master-controllers" + - "{{ openshift_service_type }}-master-api" - etcd_container failed_when: false when: openshift.common.is_containerized | bool @@ -80,9 +80,9 @@ with_items: - etcd_container - openvswitch - - "{{ openshift.common.service_type }}-master-api" - - "{{ openshift.common.service_type }}-master-controllers" - - "{{ openshift.common.service_type }}-node" + - "{{ openshift_service_type }}-master-api" + - "{{ openshift_service_type }}-master-controllers" + - "{{ openshift_service_type }}-node" failed_when: false when: openshift.common.is_containerized | bool @@ -91,7 +91,7 @@ name: "{{ item }}" state: stopped with_items: - - "{{ openshift.common.service_type }}-node" + - "{{ openshift_service_type }}-node" - openvswitch failed_when: false when: not openshift.common.is_containerized | bool |