summaryrefslogtreecommitdiffstats
path: root/playbooks/openshift-node/private
diff options
context:
space:
mode:
authorMichael Gugino <gugino.michael@yahoo.com>2017-12-08 09:52:15 -0500
committerGitHub <noreply@github.com>2017-12-08 09:52:15 -0500
commit0f98871d0f4cf39eded2fcd6041fcea4f83bbed6 (patch)
treedd4269d8cd6d4f8beb4becea8a883716e6081f13 /playbooks/openshift-node/private
parent2af8419bab887c8552337333023ce357b1a18bc0 (diff)
parenteb6b20fc9183cc2aae424c72efd1191b99110a93 (diff)
downloadopenshift-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 'playbooks/openshift-node/private')
-rw-r--r--playbooks/openshift-node/private/enable_excluders.yml1
-rw-r--r--playbooks/openshift-node/private/restart.yml8
-rw-r--r--playbooks/openshift-node/private/setup.yml1
3 files changed, 4 insertions, 6 deletions
diff --git a/playbooks/openshift-node/private/enable_excluders.yml b/playbooks/openshift-node/private/enable_excluders.yml
index 5288b14f9..30713e694 100644
--- a/playbooks/openshift-node/private/enable_excluders.yml
+++ b/playbooks/openshift-node/private/enable_excluders.yml
@@ -5,4 +5,3 @@
roles:
- role: openshift_excluder
r_openshift_excluder_action: enable
- r_openshift_excluder_service_type: "{{ openshift.common.service_type }}"
diff --git a/playbooks/openshift-node/private/restart.yml b/playbooks/openshift-node/private/restart.yml
index 41eb00f99..0786bd7d3 100644
--- a/playbooks/openshift-node/private/restart.yml
+++ b/playbooks/openshift-node/private/restart.yml
@@ -23,9 +23,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
@@ -40,7 +40,7 @@
- name: restart node
service:
- name: "{{ openshift.common.service_type }}-node"
+ name: "{{ openshift_service_type }}-node"
state: restarted
- name: Wait for node to be ready
diff --git a/playbooks/openshift-node/private/setup.yml b/playbooks/openshift-node/private/setup.yml
index 794c03a67..541913aef 100644
--- a/playbooks/openshift-node/private/setup.yml
+++ b/playbooks/openshift-node/private/setup.yml
@@ -5,7 +5,6 @@
roles:
- role: openshift_excluder
r_openshift_excluder_action: disable
- r_openshift_excluder_service_type: "{{ openshift.common.service_type }}"
- name: Evaluate node groups
hosts: localhost