x/browbeat
Code Issues Proposed changes

Merge "Pin sqlalchemy collectd plugin for OSP < 16.2"

Browse Source
This commit is contained in:
Zuul 2022-03-04 11:24:46 +00:00 committed by Gerrit Code Review
commit ae7c9d4aaf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/install/roles/collectd/tasks/main.yml
View File

@ -65,7 +65,7 @@
become: true become: true
register: db_connections register: db_connections
with_dict: "{{mysql_svcs}}" with_dict: "{{mysql_svcs}}"
when: ('Controller' in group_names and sqlalchemy_collectd_plugin) when: (rhosp_version is version('16.2', '<') and 'Controller' in group_names and sqlalchemy_collectd_plugin)
ignore_errors: true ignore_errors: true
- name: Append to mysql string - name: Append to mysql string
@ -75,7 +75,7 @@
section: database section: database
option: connection option: connection
value: "{{ item.stdout }}&plugin=collectd&collectd_program_name={{ item.item.key }}" value: "{{ item.stdout }}&plugin=collectd&collectd_program_name={{ item.item.key }}"
when: (('Controller' in group_names) and sqlalchemy_collectd_plugin and ('plugin=collectd' not in item.stdout)) when: (rhosp_version is version('16.2', '<') and ('Controller' in group_names) and sqlalchemy_collectd_plugin and ('plugin=collectd' not in item.stdout))
with_items: "{{ db_connections.results }}" with_items: "{{ db_connections.results }}"
become: true become: true
@ -100,7 +100,7 @@
- heat_api_cron - heat_api_cron
- heat_api_cfn - heat_api_cfn
ignore_errors: yes ignore_errors: yes
when: ('Controller' in group_names and sqlalchemy_collectd_plugin) when: (rhosp_version is version('16.2', '<') and 'Controller' in group_names and sqlalchemy_collectd_plugin)
# CephStorage OSD monitoring # CephStorage OSD monitoring