diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-12-05 13:28:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 13:28:35 -0500 |
| commit | 968f614e984da91a4e883a9642af8e66d49d87a0 (patch) | |
| tree | 610fc73ab31224a9753374ff109c29f797a8828c /playbooks/common | |
| parent | 03f5d8249478ca5e62eb3d5db7aa1b7a43de96eb (diff) | |
| parent | 2f76a594258e3ccdf55101c7266c65bd99c59abc (diff) | |
| download | openshift-968f614e984da91a4e883a9642af8e66d49d87a0.tar.gz openshift-968f614e984da91a4e883a9642af8e66d49d87a0.tar.bz2 openshift-968f614e984da91a4e883a9642af8e66d49d87a0.tar.xz openshift-968f614e984da91a4e883a9642af8e66d49d87a0.zip | |
Merge pull request #6154 from mtnbikenc/consolidate-openshift-logging
Playbook Consolidation - openshift-logging
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_logging.yml | 37 |
2 files changed, 1 insertions, 38 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 2eeb81b86..a8ca5e686 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -23,7 +23,7 @@ - include: ../../openshift-metrics/private/config.yml when: openshift_metrics_install_metrics | default(false) | bool -- include: openshift_logging.yml +- include: ../../openshift-logging/private/config.yml when: openshift_logging_install_logging | default(false) | bool - include: ../../openshift-prometheus/private/config.yml diff --git a/playbooks/common/openshift-cluster/openshift_logging.yml b/playbooks/common/openshift-cluster/openshift_logging.yml deleted file mode 100644 index bc59bd95a..000000000 --- a/playbooks/common/openshift-cluster/openshift_logging.yml +++ /dev/null @@ -1,37 +0,0 @@ ---- -- name: Logging Install Checkpoint Start - hosts: all - gather_facts: false - tasks: - - name: Set Logging install 'In Progress' - run_once: true - set_stats: - data: - installer_phase_logging: - status: "In Progress" - start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}" - -- name: OpenShift Aggregated Logging - hosts: oo_first_master - roles: - - openshift_logging - -- name: Update Master configs - hosts: oo_masters:!oo_first_master - tasks: - - block: - - include_role: - name: openshift_logging - tasks_from: update_master_config - -- name: Logging Install Checkpoint End - hosts: all - gather_facts: false - tasks: - - name: Set Logging install 'Complete' - run_once: true - set_stats: - data: - installer_phase_logging: - status: "Complete" - end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}" |