summaryrefslogtreecommitdiffstats
path: root/docker/ansible
diff options
context:
space:
mode:
authorEmma Foley <efoley@redhat.com>2020-07-14 18:38:09 +0100
committerEmma Foley <efoley@redhat.com>2020-07-14 18:46:18 +0100
commit03d89c5916fac0e74defac44d54dab75e0f263cd (patch)
tree02cc5ef5a73cab371f6964cbadce29fcba2d2fa5 /docker/ansible
parent59338794c8ae8ff82c00dc14ea47a9279cc213d4 (diff)
Temperorily revert "Rename collectd container to barometer-collectd-latest"
This reverts commit 59338794c8ae8ff82c00dc14ea47a9279cc213d4. The reason for reverting is that there is not yet a container image available on Dockerhub for barometer-collectd-latest Signed-off-by: Emma Foley <efoley@redhat.com> Change-Id: Ia6e37af99787a6c02eb368fc7bfdd9d584716f2b
Diffstat (limited to 'docker/ansible')
-rw-r--r--docker/ansible/default.inv4
-rw-r--r--docker/ansible/roles/config_files/tasks/snmp_agent.yml4
-rw-r--r--docker/ansible/roles/config_files/templates/master/snmp_agent.conf.j2 (renamed from docker/ansible/roles/config_files/templates/latest/snmp_agent.conf.j2)0
-rw-r--r--docker/ansible/roles/run_collectd/vars/main.yml2
4 files changed, 5 insertions, 5 deletions
diff --git a/docker/ansible/default.inv b/docker/ansible/default.inv
index 17b53c3b..e254c26a 100644
--- a/docker/ansible/default.inv
+++ b/docker/ansible/default.inv
@@ -13,8 +13,8 @@ localhost
[collectd_hosts:vars]
install_mcelog=true
insert_ipmi_modules=true
-#to use latest or experimental container set the collectd flavor below
-#possible values: stable|latest|experimental
+#to use master or experimental container set the collectd flavor below
+#possible values: stable|master|experimental
flavor=stable
[influxdb_hosts]
diff --git a/docker/ansible/roles/config_files/tasks/snmp_agent.yml b/docker/ansible/roles/config_files/tasks/snmp_agent.yml
index 797f9732..c72aee48 100644
--- a/docker/ansible/roles/config_files/tasks/snmp_agent.yml
+++ b/docker/ansible/roles/config_files/tasks/snmp_agent.yml
@@ -21,9 +21,9 @@
tags:
- snmp
-- name: enable snmp agent for latest container
+- name: enable snmp agent for master container
template:
- src: latest/snmp_agent.conf.j2
+ src: master/snmp_agent.conf.j2
dest: "{{ config_file_dir }}/snmp_agent.conf"
when: flavor|default('stable')|string != 'stable'
tags:
diff --git a/docker/ansible/roles/config_files/templates/latest/snmp_agent.conf.j2 b/docker/ansible/roles/config_files/templates/master/snmp_agent.conf.j2
index 1ff8b228..1ff8b228 100644
--- a/docker/ansible/roles/config_files/templates/latest/snmp_agent.conf.j2
+++ b/docker/ansible/roles/config_files/templates/master/snmp_agent.conf.j2
diff --git a/docker/ansible/roles/run_collectd/vars/main.yml b/docker/ansible/roles/run_collectd/vars/main.yml
index 90d6a4f0..cebd0f47 100644
--- a/docker/ansible/roles/run_collectd/vars/main.yml
+++ b/docker/ansible/roles/run_collectd/vars/main.yml
@@ -15,7 +15,7 @@
default_flavor: "{{ flavor|default('stable')|string }}"
flavor_image_name: "{{
- 'barometer-collectd-latest' if (default_flavor == 'latest') else
+ 'barometer-collectd-master' if (default_flavor == 'master') else
'barometer-collectd-experimental' if (default_flavor == 'experimental')
else 'barometer-collectd' }}"
collectd_image_name: "{{ 'opnfv/' + flavor_image_name }}"