From c4090eee0df028f768eb669a04d9cbdc66e93209 Mon Sep 17 00:00:00 2001
From: Russell Teague <rteague@redhat.com>
Date: Thu, 16 Nov 2017 15:06:33 -0500
Subject: Playbook Consolidation - openshift-metrics

---
 playbooks/aws/openshift-cluster/hosted.yml         |  2 +-
 .../byo/openshift-cluster/openshift-metrics.yml    |  4 ---
 playbooks/common/openshift-cluster/config.yml      |  2 +-
 .../common/openshift-cluster/openshift_metrics.yml | 38 ----------------------
 playbooks/openshift-metrics/config.yml             |  4 +++
 playbooks/openshift-metrics/private/config.yml     | 38 ++++++++++++++++++++++
 playbooks/openshift-metrics/private/library        |  1 +
 playbooks/openshift-metrics/private/roles          |  1 +
 8 files changed, 46 insertions(+), 44 deletions(-)
 delete mode 100644 playbooks/byo/openshift-cluster/openshift-metrics.yml
 delete mode 100644 playbooks/common/openshift-cluster/openshift_metrics.yml
 create mode 100644 playbooks/openshift-metrics/config.yml
 create mode 100644 playbooks/openshift-metrics/private/config.yml
 create mode 120000 playbooks/openshift-metrics/private/library
 create mode 120000 playbooks/openshift-metrics/private/roles

(limited to 'playbooks')

diff --git a/playbooks/aws/openshift-cluster/hosted.yml b/playbooks/aws/openshift-cluster/hosted.yml
index db6e3b8e1..3d3c871ca 100644
--- a/playbooks/aws/openshift-cluster/hosted.yml
+++ b/playbooks/aws/openshift-cluster/hosted.yml
@@ -1,7 +1,7 @@
 ---
 - include: ../../common/openshift-cluster/openshift_hosted.yml
 
-- include: ../../common/openshift-cluster/openshift_metrics.yml
+- include: ../../openshift-metrics/private/config.yml
   when: openshift_metrics_install_metrics | default(false) | bool
 
 - include: ../../common/openshift-cluster/openshift_logging.yml
diff --git a/playbooks/byo/openshift-cluster/openshift-metrics.yml b/playbooks/byo/openshift-cluster/openshift-metrics.yml
deleted file mode 100644
index e4c9ba1f7..000000000
--- a/playbooks/byo/openshift-cluster/openshift-metrics.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- include: ../../init/main.yml
-
-- include: ../../common/openshift-cluster/openshift_metrics.yml
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 3b4d6f9a6..dfeda4c4d 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -20,7 +20,7 @@
 
 - include: openshift_hosted.yml
 
-- include: openshift_metrics.yml
+- include: ../../openshift-metrics/private/config.yml
   when: openshift_metrics_install_metrics | default(false) | bool
 
 - include: openshift_logging.yml
diff --git a/playbooks/common/openshift-cluster/openshift_metrics.yml b/playbooks/common/openshift-cluster/openshift_metrics.yml
deleted file mode 100644
index 80cd93e5f..000000000
--- a/playbooks/common/openshift-cluster/openshift_metrics.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-- name: Metrics Install Checkpoint Start
-  hosts: all
-  gather_facts: false
-  tasks:
-  - name: Set Metrics install 'In Progress'
-    run_once: true
-    set_stats:
-      data:
-        installer_phase_metrics:
-          status: "In Progress"
-          start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
-
-- name: OpenShift Metrics
-  hosts: oo_first_master
-  roles:
-  - role: openshift_metrics
-
-- name: OpenShift Metrics
-  hosts: oo_masters:!oo_first_master
-  serial: 1
-  tasks:
-  - name: Setup the non-first masters configs
-    include_role:
-      name: openshift_metrics
-      tasks_from: update_master_config.yaml
-
-- name: Metrics Install Checkpoint End
-  hosts: all
-  gather_facts: false
-  tasks:
-  - name: Set Metrics install 'Complete'
-    run_once: true
-    set_stats:
-      data:
-        installer_phase_metrics:
-          status: "Complete"
-          end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
diff --git a/playbooks/openshift-metrics/config.yml b/playbooks/openshift-metrics/config.yml
new file mode 100644
index 000000000..8ee57ce8d
--- /dev/null
+++ b/playbooks/openshift-metrics/config.yml
@@ -0,0 +1,4 @@
+---
+- include: ../init/main.yml
+
+- include: private/config.yml
diff --git a/playbooks/openshift-metrics/private/config.yml b/playbooks/openshift-metrics/private/config.yml
new file mode 100644
index 000000000..80cd93e5f
--- /dev/null
+++ b/playbooks/openshift-metrics/private/config.yml
@@ -0,0 +1,38 @@
+---
+- name: Metrics Install Checkpoint Start
+  hosts: all
+  gather_facts: false
+  tasks:
+  - name: Set Metrics install 'In Progress'
+    run_once: true
+    set_stats:
+      data:
+        installer_phase_metrics:
+          status: "In Progress"
+          start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
+
+- name: OpenShift Metrics
+  hosts: oo_first_master
+  roles:
+  - role: openshift_metrics
+
+- name: OpenShift Metrics
+  hosts: oo_masters:!oo_first_master
+  serial: 1
+  tasks:
+  - name: Setup the non-first masters configs
+    include_role:
+      name: openshift_metrics
+      tasks_from: update_master_config.yaml
+
+- name: Metrics Install Checkpoint End
+  hosts: all
+  gather_facts: false
+  tasks:
+  - name: Set Metrics install 'Complete'
+    run_once: true
+    set_stats:
+      data:
+        installer_phase_metrics:
+          status: "Complete"
+          end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
diff --git a/playbooks/openshift-metrics/private/library b/playbooks/openshift-metrics/private/library
new file mode 120000
index 000000000..ba40d2f56
--- /dev/null
+++ b/playbooks/openshift-metrics/private/library
@@ -0,0 +1 @@
+../../../library
\ No newline at end of file
diff --git a/playbooks/openshift-metrics/private/roles b/playbooks/openshift-metrics/private/roles
new file mode 120000
index 000000000..20c4c58cf
--- /dev/null
+++ b/playbooks/openshift-metrics/private/roles
@@ -0,0 +1 @@
+../../../roles
\ No newline at end of file
-- 
cgit v1.2.3