diff options
| author |   Emma Foley <efoley@redhat.com> | 2021-12-17 13:07:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2021-12-17 13:07:53 +0000 |
| commit | 18206d429dd42701fc21f82c5dbc323e8b7b2eb5 (patch) | |
| tree | 76954f5145b1937e32d00e11faf8944e9b7ca1da /docker/ansible/roles/run_collectd | |
| parent | 1c7fea25a4084bafb52158c915e803b473ffbca0 (diff) | |
| parent | 5cc8e3c94bdf62c5fd9838e4987d4e670d36f9ed (diff) | |
Merge changes from topic "collectd_6_testing"
* changes:
Add a playbook that tests collectd 6 vs collectd5
[docker][ansible] Add a playbook for building the containers
Create a flask app to show metrics from collectd
Diffstat (limited to 'docker/ansible/roles/run_collectd')
| -rw-r--r-- | docker/ansible/roles/run_collectd/tasks/main.yml | 4 | ||||
| -rw-r--r-- | docker/ansible/roles/run_collectd/vars/main.yml | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/docker/ansible/roles/run_collectd/tasks/main.yml b/docker/ansible/roles/run_collectd/tasks/main.yml index 2c5d0e67..bf5aabf5 100644 --- a/docker/ansible/roles/run_collectd/tasks/main.yml +++ b/docker/ansible/roles/run_collectd/tasks/main.yml @@ -15,7 +15,7 @@ - name: remove bar-collectd container docker_container: - name: bar-collectd + name: "{{ collectd_container_name }}" state: absent tags: - rm_containers @@ -52,7 +52,7 @@ - name: launch collectd container docker_container: - name: bar-collectd + name: "{{ collectd_container_name }}" image: "{{ collectd_image_name }}" volumes: "{{ volumes_list }}" entrypoint: "/run_collectd.sh" diff --git a/docker/ansible/roles/run_collectd/vars/main.yml b/docker/ansible/roles/run_collectd/vars/main.yml index 96c9032e..26007ecf 100644 --- a/docker/ansible/roles/run_collectd/vars/main.yml +++ b/docker/ansible/roles/run_collectd/vars/main.yml @@ -13,6 +13,7 @@ # limitations under the License. --- +collectd_container_name: "bar-collectd" default_flavor: "{{ flavor|default('stable')|string }}" flavor_image_name: "{{ 'barometer-collectd-latest' if (default_flavor == 'master' or default_flavor == 'latest') else |