diff options
| author |   Emma Foley <efoley@redhat.com> | 2021-06-10 12:04:23 +0100 |
|---|---|---|
| committer | Emma Foley <efoley@redhat.com> | 2021-08-26 21:05:50 +0100 |
| commit | 44d5d79394e29d783a7ef73ba742052d97fad124 (patch) | |
| tree | 4b638f048fb97244e80d73df937ba266e1f339e8 /docker/ansible/roles/config_files/tasks | |
| parent | dfb13929a9b878c0d41b88b53c62ff56fe8b6856 (diff) | |
[ansible] Use collectd_config for virt and rdt
Only one of virt and intel_rdt can be enabled at a time, and the
existing checks are based on the existance of a {rdt,virt}.conf file to
determine whether the other plugin is enabled.
This check needed updating, and is now based on whether the other plugin
is in the collectd_plugins value.
Signed-off-by: Emma Foley <efoley@redhat.com>
Change-Id: I175d60111bf133965e1ecbf3764cb12a25356576
Diffstat (limited to 'docker/ansible/roles/config_files/tasks')
| -rw-r--r-- | docker/ansible/roles/config_files/tasks/rdt.yml | 7 | ||||
| -rw-r--r-- | docker/ansible/roles/config_files/tasks/virt.yml | 16 |
2 files changed, 10 insertions, 13 deletions
diff --git a/docker/ansible/roles/config_files/tasks/rdt.yml b/docker/ansible/roles/config_files/tasks/rdt.yml index bad67b78..f0a46261 100644 --- a/docker/ansible/roles/config_files/tasks/rdt.yml +++ b/docker/ansible/roles/config_files/tasks/rdt.yml @@ -1,4 +1,4 @@ -#Copyright 2018 OPNFV and Intel Corporation +# Copyright 2018-21 Anuket, Intel Corporation and others # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -29,9 +29,8 @@ - rdt - name: enable rdt plugin - template: - src: rdt.conf.j2 - dest: "{{ config_file_dir }}/rdt.conf" + set_fact: + collectd_plugins: "{{ collectd_plugins | union(['intel_rdt']) | unique }}" when: (rdt_result is succeeded) and (virt_file.stat.exists == False) tags: - rdt diff --git a/docker/ansible/roles/config_files/tasks/virt.yml b/docker/ansible/roles/config_files/tasks/virt.yml index 7fb0bb92..75a17a18 100644 --- a/docker/ansible/roles/config_files/tasks/virt.yml +++ b/docker/ansible/roles/config_files/tasks/virt.yml @@ -1,4 +1,4 @@ -#Copyright 2018 OPNFV and Intel Corporation +# Copyright 2018-21 Anuket, Intel Corporation and others # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,16 +21,14 @@ - virt - name: (virt) check if rdt is enabled - stat: - path: "{{ config_file_dir }}/rdt.conf" - register: rdt_file + set_fact: + rdt_enabled: true tags: - - virt + - rdt - name: enable virt plugin - template: - src: virt.conf.j2 - dest: "{{ config_file_dir }}/virt.conf" - when: libvirt_result is succeeded and rdt_file.stat.exists == False + set_fact: + collectd_plugins: "{{ collectd_plugins | union(['virt']) | unique }}" + when: libvirt_result is succeeded and not (rdt_enabled | default(false)) tags: - virt |