summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-08-31 21:53:10 -0400
committerRussell Teague <rteague@redhat.com>2017-09-01 09:05:28 -0400
commit606dc36288ef5478a9dae3f35f88e2f283d7635d (patch)
tree60d5c31251d99d1c3e87818966e09167e562369c /playbooks/common/openshift-cluster
parent4a11ed0808f508d7e9d0953149377e2e181bdae9 (diff)
downloadopenshift-606dc36288ef5478a9dae3f35f88e2f283d7635d.tar.gz
openshift-606dc36288ef5478a9dae3f35f88e2f283d7635d.tar.bz2
openshift-606dc36288ef5478a9dae3f35f88e2f283d7635d.tar.xz
openshift-606dc36288ef5478a9dae3f35f88e2f283d7635d.zip
Break out master config into stand-alone playbook
Added byo/openshift-master/config.yml as a new entry point for performing master installation. Excluder disable/enable for master has been moved to common/openshift-master/config.yml to follow a standard pattern that could be used for both installation and scaleup playbooks.
Diffstat (limited to 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/additional_config.yml23
-rw-r--r--playbooks/common/openshift-cluster/config.yml6
2 files changed, 0 insertions, 29 deletions
diff --git a/playbooks/common/openshift-cluster/additional_config.yml b/playbooks/common/openshift-cluster/additional_config.yml
deleted file mode 100644
index c0ea93d2c..000000000
--- a/playbooks/common/openshift-cluster/additional_config.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- name: Additional master configuration
- hosts: oo_first_master
- vars:
- cockpit_plugins: "{{ osm_cockpit_plugins | default(['cockpit-kubernetes']) }}"
- etcd_urls: "{{ openshift.master.etcd_urls }}"
- openshift_master_ha: "{{ groups.oo_masters | length > 1 }}"
- omc_cluster_hosts: "{{ groups.oo_masters | join(' ')}}"
- roles:
- - role: openshift_master_cluster
- when: openshift_master_ha | bool and openshift.master.cluster_method == "pacemaker"
- - role: openshift_examples
- registry_url: "{{ openshift.master.registry_url }}"
- when: openshift.common.install_examples | bool
- - role: openshift_hosted_templates
- registry_url: "{{ openshift.master.registry_url }}"
- - role: openshift_manageiq
- when: openshift.common.use_manageiq | bool
- - role: cockpit
- when: not openshift.common.is_atomic and ( deployment_type in ['atomic-enterprise','openshift-enterprise'] ) and
- (osm_use_cockpit | bool or osm_use_cockpit is undefined ) and ( openshift.common.deployment_subtype != 'registry' )
- - role: flannel_register
- when: openshift.common.use_flannel | bool
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 7874391cc..a406b5656 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -35,12 +35,6 @@
- loadbalancer
- include: ../openshift-master/config.yml
- tags:
- - master
-
-- include: additional_config.yml
- tags:
- - master
- include: ../openshift-node/config.yml
tags: