diff options
| author | Russell Teague <rteague@redhat.com> | 2017-11-16 15:06:33 -0500 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2017-11-16 15:12:56 -0500 |
| commit | c4090eee0df028f768eb669a04d9cbdc66e93209 (patch) | |
| tree | 4c7b699024f221406375f5af6fd82b039b3b1485 /playbooks/common | |
| parent | 7a18158c1df667d2bc45fae3ca62ed35400bedb8 (diff) | |
| download | openshift-c4090eee0df028f768eb669a04d9cbdc66e93209.tar.gz openshift-c4090eee0df028f768eb669a04d9cbdc66e93209.tar.bz2 openshift-c4090eee0df028f768eb669a04d9cbdc66e93209.tar.xz openshift-c4090eee0df028f768eb669a04d9cbdc66e93209.zip | |
Playbook Consolidation - openshift-metrics
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_metrics.yml | 38 |
2 files changed, 1 insertions, 39 deletions
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') }}" |