summaryrefslogtreecommitdiffstats
path: root/playbooks/openshift-master/private/config.yml
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-11-27 15:39:46 -0500
committerMichael Gugino <mgugino@redhat.com>2017-12-07 14:37:36 -0500
commiteb6b20fc9183cc2aae424c72efd1191b99110a93 (patch)
treeae3dec3c4b4581471f3de0afd8a1711235242cc6 /playbooks/openshift-master/private/config.yml
parent37ffebc86cd4fe89373542285b40d92f61696270 (diff)
downloadopenshift-eb6b20fc9183cc2aae424c72efd1191b99110a93.tar.gz
openshift-eb6b20fc9183cc2aae424c72efd1191b99110a93.tar.bz2
openshift-eb6b20fc9183cc2aae424c72efd1191b99110a93.tar.xz
openshift-eb6b20fc9183cc2aae424c72efd1191b99110a93.zip
Remove openshift.common.service_type
This commit removes openshift.common.service_type in favor of openshift_service_type. This commit also removes r_openshift_excluder_service_type from plays in favor of using the role's defaults.
Diffstat (limited to 'playbooks/openshift-master/private/config.yml')
-rw-r--r--playbooks/openshift-master/private/config.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/openshift-master/private/config.yml b/playbooks/openshift-master/private/config.yml
index afb8d6bd1..61fd54caa 100644
--- a/playbooks/openshift-master/private/config.yml
+++ b/playbooks/openshift-master/private/config.yml
@@ -19,7 +19,6 @@
roles:
- role: openshift_excluder
r_openshift_excluder_action: disable
- r_openshift_excluder_service_type: "{{ openshift.common.service_type }}"
- name: Gather and set facts for master hosts
hosts: oo_masters_to_config
@@ -228,6 +227,8 @@
- name: Configure API Aggregation on masters
hosts: oo_masters
serial: 1
+ roles:
+ - role: openshift_facts
tasks:
- include_tasks: tasks/wire_aggregator.yml
@@ -237,7 +238,6 @@
roles:
- role: openshift_excluder
r_openshift_excluder_action: enable
- r_openshift_excluder_service_type: "{{ openshift.common.service_type }}"
- name: Master Install Checkpoint End
hosts: all