x/browbeat
Code Issues Proposed changes

collectd: Fix deprecation warnings

Browse Source 
Fix deprecation warnings when running newer versions
of ansible.

Change-Id: Ib431d086688d14fa59fc57b3f2820ae0c5d5b871
Signed-off-by: Charles Short <chucks@redhat.com>
This commit is contained in:
Charles Short 2019-07-08 13:03:59 -04:00
parent cda7cc180b
commit 3d9478aef2
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ansible/install/collectd-openstack.yml
View File

@ -21,10 +21,10 @@
vars: vars:
config_type: undercloud config_type: undercloud
roles: roles:
- { role: common, when: collectd_undercloud } - { role: common, when: collectd_undercloud|bool }
- { role: epel, when: collectd_undercloud and ansible_distribution_major_version == '7'} - { role: epel, when: collectd_undercloud|bool and ansible_distribution_major_version == '7'}
- { role: repo } - { role: repo }
- { role: collectd-openstack, when: collectd_undercloud } - { role: collectd-openstack, when: collectd_undercloud|bool }
tasks: tasks:
- name: Collectd off if not collectd_undercloud - name: Collectd off if not collectd_undercloud
service: name=collectd state=stopped enabled=false service: name=collectd state=stopped enabled=false
@ -40,10 +40,10 @@
config_type: controller config_type: controller
roles: roles:
- { role: osp_version } - { role: osp_version }
- { role: common, when: collectd_controller } - { role: common, when: collectd_controller|bool }
- { role: epel, when: collectd_controller and ansible_distribution_major_version == '7'} - { role: epel, when: collectd_controller|bool and ansible_distribution_major_version == '7'}
- { role: repo } - { role: repo }
- { role: collectd-openstack, when: collectd_controller } - { role: collectd-openstack, when: collectd_controller|bool }
tasks: tasks:
- name: Collectd off if not collectd_controller - name: Collectd off if not collectd_controller
service: name=collectd state=stopped enabled=false service: name=collectd state=stopped enabled=false
@ -58,10 +58,10 @@
vars: vars:
config_type: networker config_type: networker
roles: roles:
- { role: common, when: collectd_networker } - { role: common, when: collectd_networker|bool }
- { role: epel, when: collectd_networker and ansible_distribution_major_version == '7'} - { role: epel, when: collectd_networker|bool and ansible_distribution_major_version == '7'}
- { role: repo } - { role: repo }
- { role: collectd-openstack, when: collectd_networker } - { role: collectd-openstack, when: collectd_networker|bool }
tasks: tasks:
- name: Collectd off if not collectd_networker - name: Collectd off if not collectd_networker
service: name=collectd state=stopped enabled=false service: name=collectd state=stopped enabled=false
@ -76,10 +76,10 @@
vars: vars:
config_type: blockstorage config_type: blockstorage
roles: roles:
- { role: common, when: collectd_blockstorage } - { role: common, when: collectd_blockstorage|bool }
- { role: epel, when: collectd_blockstorage ansible_distribution_major_version == '7' } - { role: epel, when: collectd_blockstorage|bool and ansible_distribution_major_version == '7' }
- { role: repo } - { role: repo }
- { role: collectd-openstack, when: collectd_blockstorage } - { role: collectd-openstack, when: collectd_blockstorage|bool }
tasks: tasks:
- name: Collectd off if not collectd_blockstorage - name: Collectd off if not collectd_blockstorage
service: name=collectd state=stopped enabled=false service: name=collectd state=stopped enabled=false
@ -94,10 +94,10 @@
vars: vars:
config_type: objectstorage config_type: objectstorage
roles: roles:
- { role: common, when: collectd_objectstorage } - { role: common, when: collectd_objectstorage|bool }
- { role: epel, when: collectd_objectstorage ansible_distribution_major_version == '7' } - { role: epel, when: collectd_objectstorage and ansible_distribution_major_version == '7' }
- { role: repo } - { role: repo }
- { role: collectd-openstack, when: collectd_objectstorage } - { role: collectd-openstack, when: collectd_objectstorage|bool }
tasks: tasks:
- name: Collectd off if not collectd_objectstorage - name: Collectd off if not collectd_objectstorage
service: name=collectd state=stopped enabled=false service: name=collectd state=stopped enabled=false
@ -112,10 +112,10 @@
vars: vars:
config_type: cephstorage config_type: cephstorage
roles: roles:
- { role: common, when: collectd_cephstorage } - { role: common, when: collectd_cephstorage|bool }
- { role: epel, when: collectd_cephstorage and ansible_distribution_major_version == '7'} - { role: epel, when: collectd_cephstorage|bool and ansible_distribution_major_version == '7'}
- { role: repo } - { role: repo }
- { role: collectd-openstack, when: collectd_cephstorage } - { role: collectd-openstack, when: collectd_cephstorage|bool }
tasks: tasks:
- name: Collectd off if not collectd_cephstorage - name: Collectd off if not collectd_cephstorage
service: name=collectd state=stopped enabled=false service: name=collectd state=stopped enabled=false
@ -131,10 +131,10 @@
config_type: compute config_type: compute
roles: roles:
- { role: osp_version } - { role: osp_version }
- { role: common, when: collectd_compute } - { role: common, when: collectd_compute|bool }
- { role: epel, when: collectd_compute and ansible_distribution_major_version == '7'} - { role: epel, when: collectd_compute|bool and ansible_distribution_major_version == '7'}
- { role: repo } - { role: repo }
- { role: collectd-openstack, when: collectd_compute } - { role: collectd-openstack, when: collectd_compute|bool }
tasks: tasks:
- name: Collectd off if not collectd_compute - name: Collectd off if not collectd_compute
service: name=collectd state=stopped enabled=false service: name=collectd state=stopped enabled=false