diff options
| author |   Emma Foley <efoley@redhat.com> | 2021-04-21 14:37:13 +0100 |
|---|---|---|
| committer | Emma Foley <efoley@redhat.com> | 2021-06-03 13:28:36 +0100 |
| commit | d49c6ba0cc7f5892c65c67afdaa1ee77ce3aa182 (patch) | |
| tree | 15a032995fcad631b8733c2394938de61bcf5e2b /docker | |
| parent | 28517f841a3261987114869e04624cdd686c31a5 (diff) | |
[docker] Add collectd-6
* Add instruction to docs/ for using
docker/barometer-collectd-experimental/Dockerfile to build collectd
version 6
* Add a new COLLECTD_FLAVOR to src/collectd/Makefile to configure
tags for a collectd 6 build.
* Allow passing COLLECTD_CONFIG_CMD_ARGS to the collectd build
For testing with new plugins for collectd-6, as un-ported plugins are
disabled by default.
This new option lets the ./configure command be run with extra args,
e.g. --enable-cpu --enable-<my-newly-ported-plugin>, which means that
plugin can be enabled for the PR that is being tested.
* Update flavor_image_name selection to include collectd-6
Change-Id: I55ee0bbcb5d89357b1ef11ab17c5b029603ecdf7
Signed-off-by: Emma Foley <efoley@redhat.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ansible/roles/run_collectd/vars/main.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docker/ansible/roles/run_collectd/vars/main.yml b/docker/ansible/roles/run_collectd/vars/main.yml index cebd0f47..ddfec146 100644 --- a/docker/ansible/roles/run_collectd/vars/main.yml +++ b/docker/ansible/roles/run_collectd/vars/main.yml @@ -15,7 +15,8 @@ default_flavor: "{{ flavor|default('stable')|string }}" flavor_image_name: "{{ - 'barometer-collectd-master' if (default_flavor == 'master') else - 'barometer-collectd-experimental' if (default_flavor == 'experimental') + 'barometer-collectd-latest' if (default_flavor == 'master' or default_flavor == 'latest') else + 'barometer-collectd-experimental' if (default_flavor == 'experimental') else + 'barometer-collectd-6' if (default_flavor == 'collectd-6') else 'barometer-collectd' }}" collectd_image_name: "{{ 'opnfv/' + flavor_image_name }}" |