2 files changed, 1 insertions, 39 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index bd65b3c8f..fce5b652d 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') }}"