diff options
| author | Russell Teague <rteague@redhat.com> | 2017-09-25 14:54:26 -0400 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2017-09-27 14:48:59 -0400 |
| commit | c096aff90d117e485e5bea17c9386d16c571fb5d (patch) | |
| tree | 2fe33915a2f0f9b4c97a6edafe2ba56bf62ccc7d /playbooks/common/openshift-cluster/config.yml | |
| parent | 54c41923ed30ba7e46dd12d15157195feca093a6 (diff) | |
| download | openshift-c096aff90d117e485e5bea17c9386d16c571fb5d.tar.gz openshift-c096aff90d117e485e5bea17c9386d16c571fb5d.tar.bz2 openshift-c096aff90d117e485e5bea17c9386d16c571fb5d.tar.xz openshift-c096aff90d117e485e5bea17c9386d16c571fb5d.zip | |
OpenShift-Ansible Installer Checkpointing
- Added installer_checkpoint role and callback plugin
- Added checkpoint 'Start' and 'End' plays to each installation phase
Additional items related to enabling proper checkpointing:
- Removed openshift_set_hostname and related task (related to 3.0)
- Added openshift-hosted entry point playbook
- Moved openshift metrics and logging out of openshift_hosted playbook
- Moved API Aggregation play to master install
Diffstat (limited to 'playbooks/common/openshift-cluster/config.yml')
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 42 |
1 files changed, 9 insertions, 33 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 804ea8eb8..bf6f4e7cd 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -22,57 +22,33 @@ tags: - always -- name: Set hostname - hosts: oo_masters_to_config:oo_nodes_to_config - tasks: - # TODO: switch back to hostname module once we depend on ansible-2.4 - # https://github.com/ansible/ansible/pull/25906 - - name: Set hostname - command: "hostnamectl set-hostname {{ openshift.common.hostname }}" - when: openshift_set_hostname | default(false,true) | bool - - include: ../openshift-etcd/config.yml - include: ../openshift-nfs/config.yml - tags: - - nfs + when: groups.oo_nfs_to_config | default([]) | count > 0 - include: ../openshift-loadbalancer/config.yml - tags: - - loadbalancer + when: groups.oo_lb_to_config | default([]) | count > 0 - include: ../openshift-master/config.yml - include: ../openshift-master/additional_config.yml - include: ../openshift-node/config.yml - tags: - - node - include: ../openshift-glusterfs/config.yml - tags: - - glusterfs + when: groups.oo_glusterfs_to_config | default([]) | count > 0 - include: openshift_hosted.yml - tags: - - hosted -- name: Configure API Aggregation on masters - hosts: oo_masters - serial: 1 - tasks: - - block: - - include_role: - name: openshift_service_catalog - tasks_from: wire_aggregator - vars: - first_master: "{{ groups.oo_first_master[0] }}" +- include: openshift_metrics.yml + when: openshift_metrics_install_metrics | default(false) | bool + +- include: openshift_logging.yml + when: openshift_logging_install_logging | default(false) | bool - include: service_catalog.yml - when: - - openshift_enable_service_catalog | default(false) | bool - tags: - - servicecatalog + when: openshift_enable_service_catalog | default(false) | bool - name: Print deprecated variable warning message if necessary hosts: oo_first_master |