aboutsummaryrefslogtreecommitdiffstats
path: root/docker/ansible/roles/config_files/tasks
diff options
context:
space:
mode:
authorEmma Foley <efoley@redhat.com>2021-08-30 14:08:59 +0000
committerGerrit Code Review <gerrit@opnfv.org>2021-08-30 14:08:59 +0000
commit6f31a4b549de47be5d3941e1013b698f7c8801e7 (patch)
treea212979921e29cdc00c62839047d72bad5d6f860 /docker/ansible/roles/config_files/tasks
parentc179470b3e50089aa1d8c2b03594c42a3880d411 (diff)
parent44d5d79394e29d783a7ef73ba742052d97fad124 (diff)
Merge "[ansible] Use collectd_config for virt and rdt"
Diffstat (limited to 'docker/ansible/roles/config_files/tasks')
-rw-r--r--docker/ansible/roles/config_files/tasks/rdt.yml7
-rw-r--r--docker/ansible/roles/config_files/tasks/virt.yml16
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