diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-09-01 13:01:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-01 13:01:24 -0400 |
| commit | 2fdd7892232de00431601b817d428742e05efdf2 (patch) | |
| tree | 60d5c31251d99d1c3e87818966e09167e562369c /playbooks/common/openshift-cluster | |
| parent | 4a11ed0808f508d7e9d0953149377e2e181bdae9 (diff) | |
| parent | 606dc36288ef5478a9dae3f35f88e2f283d7635d (diff) | |
| download | openshift-2fdd7892232de00431601b817d428742e05efdf2.tar.gz openshift-2fdd7892232de00431601b817d428742e05efdf2.tar.bz2 openshift-2fdd7892232de00431601b817d428742e05efdf2.tar.xz openshift-2fdd7892232de00431601b817d428742e05efdf2.zip | |
Merge pull request #5285 from mtnbikenc/breakout-master-config
Merged by openshift-bot
Diffstat (limited to 'playbooks/common/openshift-cluster')
| -rw-r--r-- | playbooks/common/openshift-cluster/additional_config.yml | 23 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 6 |
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: |