From 2f76a594258e3ccdf55101c7266c65bd99c59abc Mon Sep 17 00:00:00 2001
From: Russell Teague <rteague@redhat.com>
Date: Thu, 16 Nov 2017 15:53:54 -0500
Subject: Playbook Consolidation - openshift-logging

---
 playbooks/common/openshift-cluster/config.yml      |  2 +-
 .../common/openshift-cluster/openshift_logging.yml | 37 ----------------------
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 playbooks/common/openshift-cluster/openshift_logging.yml

(limited to 'playbooks/common/openshift-cluster')

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') }}"
-- 
cgit v1.2.3