summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-11-22 08:35:36 -0500
committerGitHub <noreply@github.com>2017-11-22 08:35:36 -0500
commit46ce19180bf4fe05327ab8a15bb689d908779e75 (patch)
treed673b62b98a5cc48cfbcc84c8f935eb988f86643 /playbooks/common/openshift-cluster
parent16e4acfe143e954c07c774c5c163fbd4ff1e4647 (diff)
parentc4090eee0df028f768eb669a04d9cbdc66e93209 (diff)
downloadopenshift-46ce19180bf4fe05327ab8a15bb689d908779e75.tar.gz
openshift-46ce19180bf4fe05327ab8a15bb689d908779e75.tar.bz2
openshift-46ce19180bf4fe05327ab8a15bb689d908779e75.tar.xz
openshift-46ce19180bf4fe05327ab8a15bb689d908779e75.zip
Merge pull request #6152 from mtnbikenc/consolidate-openshift-metrics
Playbook Consolidation - openshift-metrics
Diffstat (limited to 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/config.yml2
-rw-r--r--playbooks/common/openshift-cluster/openshift_metrics.yml38
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') }}"