diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/README_collectd | 18 | ||||
| -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/master/snmp_agent.conf.j2 (renamed from docker/ansible/roles/config_files/templates/latest/snmp_agent.conf.j2) | 0 | ||||
| -rw-r--r-- | docker/ansible/roles/run_collectd/vars/main.yml | 2 | ||||
| -rw-r--r-- | docker/barometer-collectd-experimental/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/barometer-collectd-master/Dockerfile (renamed from docker/barometer-collectd-latest/Dockerfile) | 4 | ||||
| -rw-r--r-- | docker/barometer-collectd-master/run_collectd.sh (renamed from docker/barometer-collectd-latest/run_collectd.sh) | 0 |
8 files changed, 17 insertions, 17 deletions
diff --git a/docker/README_collectd b/docker/README_collectd index cf497105..baa0ff6e 100644 --- a/docker/README_collectd +++ b/docker/README_collectd @@ -9,7 +9,7 @@ Table of content: 1. DESCRIPTION 2. SYSTEM REQUIREMENTS 3. INSTALLATION NOTES - barometer-collectd -4. INSTALLATION NOTES - barometer-collectd-latest +4. INSTALLATION NOTES - barometer-collectd-master 5. ADDITIONAL STEPS ------------------------------------------------------------------------------ @@ -18,7 +18,7 @@ Table of content: This Dockerfile provides instruction for building collect in isolated container. There are currently two variants of collectd container: - barometer-collectd - it is based on stable collect release - - barometer-collectd-latest - development container that is based on + - barometer-collectd-master - development container that is based on latest 'main' branch for collectd project. It contains all available collectd plugins and features that are available on 'main' branch but some issues with configuration or stability may occur @@ -46,22 +46,22 @@ sudo docker run -ti --net=host -v `pwd`/src/collectd/collectd_sample_configs:/op /opt/collectd/sbin/collectd -f ------------------------------------------------------------------------------ -4. INSTALLATION NOTES: barometer-collectd-latest (development container) +4. INSTALLATION NOTES: barometer-collectd-master (development container) -To build docker barometer-collectd-latest container run (it is based on main branch from collectd): -sudo docker build -f ./docker/barometer-collectd-latest/Dockerfile . +To build docker barometer-collectd-master container run (it is based on main branch from collectd): +sudo docker build -f ./docker/barometer-collectd-master/Dockerfile . from root barometer folder. To run builded image run sudo docker images # get docker image id -sudo docker run -ti --net=host -v `pwd`/src/collectd/collectd_sample_configs-latest:/opt/collectd/etc/collectd.conf.d \ +sudo docker run -ti --net=host -v `pwd`/src/collectd/collectd_sample_configs-master:/opt/collectd/etc/collectd.conf.d \ -v /var/run:/var/run -v /tmp:/tmp --privileged <image id> -NOTE: barometer-collectd-latest container uses a different sample configurations files -compared to regular barometer-collectd container (src/collectd/collectd_sample_configs-latest) +NOTE: barometer-collectd-master container uses a different sample configurations files +compared to regular barometer-collectd container (src/collectd/collectd_sample_configs-master) To make some changes run -sudo docker run -ti --net=host -v `pwd`/src/collectd/collectd_sample_configs-latest:/opt/collectd/etc/collectd.conf.d \ +sudo docker run -ti --net=host -v `pwd`/src/collectd/collectd_sample_configs-master:/opt/collectd/etc/collectd.conf.d \ -v /var/run:/var/run -v /tmp:/tmp --privileged --entrypoint=/bin/bash <image id> /opt/collectd/sbin/collectd -f diff --git a/docker/ansible/default.inv b/docker/ansible/default.inv index 17b53c3b..e254c26a 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 latest or experimental container set the collectd flavor below -#possible values: stable|latest|experimental +#to use master or experimental container set the collectd flavor below +#possible values: stable|master|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 797f9732..c72aee48 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 latest container +- name: enable snmp agent for master container template: - src: latest/snmp_agent.conf.j2 + src: master/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/latest/snmp_agent.conf.j2 b/docker/ansible/roles/config_files/templates/master/snmp_agent.conf.j2 index 1ff8b228..1ff8b228 100644 --- a/docker/ansible/roles/config_files/templates/latest/snmp_agent.conf.j2 +++ b/docker/ansible/roles/config_files/templates/master/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 90d6a4f0..cebd0f47 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-latest' if (default_flavor == 'latest') else + 'barometer-collectd-master' if (default_flavor == 'master') else 'barometer-collectd-experimental' if (default_flavor == 'experimental') else 'barometer-collectd' }}" collectd_image_name: "{{ 'opnfv/' + flavor_image_name }}" diff --git a/docker/barometer-collectd-experimental/Dockerfile b/docker/barometer-collectd-experimental/Dockerfile index a9f262e4..49016d9b 100644 --- a/docker/barometer-collectd-experimental/Dockerfile +++ b/docker/barometer-collectd-experimental/Dockerfile @@ -34,7 +34,7 @@ COPY docker/barometer-collectd-experimental/collectd_apply_pull_request.sh \ # copying additional experimental configs on top of configs for 'main' # branch release COPY docker/barometer-collectd-experimental/experimental-configs/* \ - ${repos_dir}/barometer/src/collectd/collectd_sample_configs-latest/ + ${repos_dir}/barometer/src/collectd/collectd_sample_configs-master/ WORKDIR ${repos_dir}/barometer/systems RUN sh ./build_base_machine.sh && \ diff --git a/docker/barometer-collectd-latest/Dockerfile b/docker/barometer-collectd-master/Dockerfile index 43b0ab06..9637a486 100644 --- a/docker/barometer-collectd-latest/Dockerfile +++ b/docker/barometer-collectd-master/Dockerfile @@ -20,7 +20,7 @@ RUN yum update -y && \ git config --global http.sslVerify false ENV DOCKER y -ENV COLLECTD_FLAVOR latest +ENV COLLECTD_FLAVOR master ENV WITH_DPDK y ENV repos_dir /src ENV openstack_plugins /src/barometer/src/collectd-openstack-plugins @@ -39,7 +39,7 @@ RUN make && \ pip install --upgrade pip && \ pip install -r ${openstack_plugins}/collectd-openstack-plugins/requirements.txt -COPY docker/barometer-collectd-latest/run_collectd.sh /run_collectd.sh +COPY docker/barometer-collectd-master/run_collectd.sh /run_collectd.sh RUN chmod +x /run_collectd.sh ENTRYPOINT ["/run_collectd.sh"] diff --git a/docker/barometer-collectd-latest/run_collectd.sh b/docker/barometer-collectd-master/run_collectd.sh index 5920248a..5920248a 100644 --- a/docker/barometer-collectd-latest/run_collectd.sh +++ b/docker/barometer-collectd-master/run_collectd.sh |