Merge "[ansible] Update naming master->latest for SNMP template"

diff --git a/docker/ansible/default.inv b/docker/ansible/default.inv
index e254c26..d65e1c0 100644 (file)
--- 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 master or experimental container set the collectd flavor below
-#possible values: stable|master|experimental
+#to use latest (collectd-main branch) or experimental (main + PRs) container
+#set the collectd flavor below. Possible values: stable|latest|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 c72aee4..5e1ba97 100644 (file)
--- 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 non-stable 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
similarity index 100%
rename from docker/ansible/roles/config_files/templates/master/snmp_agent.conf.j2
rename to docker/ansible/roles/config_files/templates/latest/snmp_agent.conf.j2