summaryrefslogtreecommitdiffstats
path: root/docker/ansible/roles
diff options
context:
space:
mode:
authorEmma Foley <efoley@redhat.com>2020-06-30 13:29:27 +0100
committerEmma Foley <efoley@redhat.com>2020-06-30 16:36:55 +0100
commit59338794c8ae8ff82c00dc14ea47a9279cc213d4 (patch)
treefde29d6eab831d3dba05af20ae2de6b6f9949f4f /docker/ansible/roles
parent320257e17b3a03915ed781fe955e39e1f5255591 (diff)
Rename collectd container to barometer-collectd-latest
Change-Id: I0dfff659b4e05e3e619ea62f1771db79f7a8f0df Signed-off-by: Emma Foley <efoley@redhat.com>
Diffstat (limited to 'docker/ansible/roles')
-rw-r--r--docker/ansible/roles/config_files/tasks/snmp_agent.yml4
-rw-r--r--docker/ansible/roles/config_files/templates/latest/snmp_agent.conf.j2 (renamed from docker/ansible/roles/config_files/templates/master/snmp_agent.conf.j2)0
-rw-r--r--docker/ansible/roles/run_collectd/vars/main.yml2
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/ansible/roles/config_files/tasks/snmp_agent.yml b/docker/ansible/roles/config_files/tasks/snmp_agent.yml
index c72aee48..797f9732 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 master container
+- name: enable snmp agent for latest container
template:
- src: master/snmp_agent.conf.j2
+ src: latest/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/master/snmp_agent.conf.j2 b/docker/ansible/roles/config_files/templates/latest/snmp_agent.conf.j2
index 1ff8b228..1ff8b228 100644
--- a/docker/ansible/roles/config_files/templates/master/snmp_agent.conf.j2
+++ b/docker/ansible/roles/config_files/templates/latest/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 cebd0f47..90d6a4f0 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-master' if (default_flavor == 'master') else
+ 'barometer-collectd-latest' if (default_flavor == 'latest') else
'barometer-collectd-experimental' if (default_flavor == 'experimental')
else 'barometer-collectd' }}"
collectd_image_name: "{{ 'opnfv/' + flavor_image_name }}"