diff options
| author |   Emma Foley <efoley@redhat.com> | 2021-06-16 14:41:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2021-06-16 14:41:24 +0000 |
| commit | 0587c7831c82e6647d1a238676a11c4e05423af0 (patch) | |
| tree | 8951f4341c9a494dcabd5edb53fa244e25b42135 /docker | |
| parent | 7687ddcd9c6ca2a2266e34dd811289b336042a88 (diff) | |
| parent | 7a1df56a5759d226f2ff5831857d63955cf96371 (diff) | |
Merge "[ansible] Update naming master->latest for SNMP template"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ansible/default.inv | 4 | ||||
| -rw-r--r-- | docker/ansible/roles/config_files/tasks/snmp_agent.yml | 4 | ||||
| -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 |
3 files changed, 4 insertions, 4 deletions
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 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 |