Merge "fix metrics start stop and cron job PATH"
This commit is contained in:
commit
b9f85b6000
@ -1,18 +1,16 @@
|
||||
---
|
||||
- name: start collectd for osp <= 17
|
||||
block:
|
||||
- name: set fact collectd_container
|
||||
- name: set fact collectd_container
|
||||
import_playbook: pre-collectd.yml
|
||||
|
||||
- name: Start containerized collectd (Stein and greater recommended)
|
||||
import_playbook: start-collectd-container.yml
|
||||
when: hostvars['undercloud']['collectd_container']
|
||||
|
||||
- name: Start collectd installed through RPMs
|
||||
import_playbook: start-collectd-baremetal.yml
|
||||
when: not hostvars['undercloud']['collectd_container']
|
||||
when: not is_rhoso_deployment
|
||||
|
||||
- name: Start containerized collectd (Stein and greater recommended)
|
||||
import_playbook: start-collectd-container.yml
|
||||
when: hostvars['undercloud']['collectd_container'] and not is_rhoso_deployment
|
||||
|
||||
- name: Start collectd installed through RPMs
|
||||
import_playbook: start-collectd-baremetal.yml
|
||||
when: not hostvars['undercloud']['collectd_container'] and not is_rhoso_deployment
|
||||
|
||||
- name: Start collectd on RHOSO OCP workers
|
||||
import_playbook: start-collectd-rhoso.yml
|
||||
when: is_rhoso_deployment
|
||||
|
@ -1,18 +1,16 @@
|
||||
---
|
||||
- name: stop collectd on osp <= 17
|
||||
block:
|
||||
- name: set fact collectd_container
|
||||
- name: set fact collectd_container
|
||||
import_playbook: pre-collectd.yml
|
||||
|
||||
- name: Run containerized collectd (Stein and greater recommended)
|
||||
import_playbook: stop-collectd-container.yml
|
||||
when: hostvars['undercloud']['collectd_container']
|
||||
|
||||
- name: Run collectd installed through RPMs
|
||||
import_playbook: stop-collectd-baremetal.yml
|
||||
when: not hostvars['undercloud']['collectd_container']
|
||||
when: not is_rhoso_deployment
|
||||
|
||||
- name: Run containerized collectd (Stein and greater recommended)
|
||||
import_playbook: stop-collectd-container.yml
|
||||
when: hostvars['undercloud']['collectd_container'] and not is_rhoso_deployment
|
||||
|
||||
- name: Run collectd installed through RPMs
|
||||
import_playbook: stop-collectd-baremetal.yml
|
||||
when: not hostvars['undercloud']['collectd_container'] and not is_rhoso_deployment
|
||||
|
||||
- name: stop collectd on RHOSO ocp workers
|
||||
import_playbook: stop-collectd-rhoso.yml
|
||||
when: is_rhoso_deployment
|
||||
|
@ -31,5 +31,5 @@
|
||||
cron:
|
||||
name: "Index ocp data for the given time"
|
||||
minute: "*/{{ kubeburner_index_interval | int }}"
|
||||
job: "PATH=/usr/local/bin:/usr/bin:/bin && /usr/bin/ansible-playbook {{ browbeat_path }}/ansible/install/index-ocp-data.yml > /tmp/ocp_index_cron.log 2>&1"
|
||||
job: "PATH={{ ansible_env.PATH }} && ansible-playbook {{ browbeat_path }}/ansible/install/index-ocp-data.yml > /tmp/ocp_index_cron.log 2>&1"
|
||||
state: "{{ cron_state }}"
|
||||
|
Loading…
Reference in New Issue
Block a user