From 7a1df56a5759d226f2ff5831857d63955cf96371 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Fri, 9 Apr 2021 13:53:40 +0100 Subject: [PATCH] [ansible] Update naming master->latest for SNMP template * config_files: Rename templates/master to templates/latest Change-Id: I5db6491695bf35a87851f779603dc16454c117d5 Signed-off-by: Emma Foley --- docker/ansible/default.inv | 4 ++-- docker/ansible/roles/config_files/tasks/snmp_agent.yml | 4 ++-- .../config_files/templates/{master => latest}/snmp_agent.conf.j2 | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename docker/ansible/roles/config_files/templates/{master => latest}/snmp_agent.conf.j2 (100%) diff --git a/docker/ansible/default.inv b/docker/ansible/default.inv index e254c26a..d65e1c0e 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 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 c72aee48..5e1ba975 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 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 -- 2.16.6