9 files changed, 23 insertions, 75 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
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 }}"
diff --git a/docker/barometer-collectd-experimental/Dockerfile b/docker/barometer-collectd-experimental/Dockerfile
index 2cb26825..8622a63c 100644
--- a/docker/barometer-collectd-experimental/Dockerfile
+++ b/docker/barometer-collectd-experimental/Dockerfile
@@ -1,4 +1,5 @@
-# Copyright 2017-2019 Intel Corporation and OPNFV. All rights reserved.
+# Copyright 2017-2021 Intel Corporation, Anuket and others.
+# All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,30 +15,21 @@
 #
 
 FROM centos:8
-RUN dnf update -y && \
-        dnf install -y which sudo git && \
-        dnf clean all && \
-        git config --global http.sslVerify false
 
-ENV DOCKER y
-ENV COLLECTD_FLAVOR experimental
+ARG COLLECTD_FLAVOR=experimental
 ARG COLLECTD_PULL_REQUESTS
-ENV WITH_DPDK y
+ARG COLLECTD_CONFIG_CMD_ARGS
+ARG COLLECTD_TAG
+ARG WITH_DPDK=n
+
+ENV DOCKER y
 ENV repos_dir /src
 
-WORKDIR ${repos_dir}
 RUN mkdir -p ${repos_dir}/barometer
 COPY . ${repos_dir}/barometer
-COPY docker/barometer-collectd-experimental/collectd_apply_pull_request.sh \
-     ${repos_dir}/barometer/src/collectd/
-
-# 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-master/
 
 WORKDIR ${repos_dir}/barometer/systems
-RUN sh ./build_base_machine.sh && \
+RUN ./build_base_machine.sh && \
         dnf clean all && rm -rf /var/cache/dnf && \
         useradd -ms /bin/bash collectd_exec && \
         echo "collectd_exec ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
diff --git a/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh b/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh
deleted file mode 100755
index dbbc5f26..00000000
--- a/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/bash
-# Copyright 2019 Intel Corporation and OPNFV. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# This files contains list of pull requests to be applied on top
-# of main branch before building collectd included in docker
-# collectd-experimental container
-
-# Use this script with a COLLECTD_PULL_REQUESTS variable defined
-# for example:
-# COLLECTD_PULL_REQUESTS="3027,3028" ./collectd_apply_pull_request.sh
-
-if [ -z "$COLLECTD_PULL_REQUESTS" ];
-then
-	echo "COLLECTD_PULL_REQUESTS is unset, exiting"
-	exit
-fi
-
-IFS=', ' read -a PULL_REQUESTS <<< "$COLLECTD_PULL_REQUESTS"
-
-# during rebasing/merging git requires email & name to be set
-git config user.email "barometer-experimental@container"
-git config user.name "BarometerExperimental"
-
-for PR_ID in "${PULL_REQUESTS[@]}"
-do
-    echo "Applying pull request $PR_ID"
-    git pull --rebase origin pull/$PR_ID/head
-done
diff --git a/docker/barometer-collectd-experimental/experimental-configs/README b/docker/barometer-collectd-experimental/experimental-configs/README
deleted file mode 100644
index e4386358..00000000
--- a/docker/barometer-collectd-experimental/experimental-configs/README
+++ /dev/null
@@ -1 +0,0 @@
-Place here configuration files that are required by experimental pull requests
diff --git a/docker/barometer-collectd-latest/Dockerfile b/docker/barometer-collectd-latest/Dockerfile
index 4c01c870..b3a7a646 100644
--- a/docker/barometer-collectd-latest/Dockerfile
+++ b/docker/barometer-collectd-latest/Dockerfile
@@ -1,4 +1,5 @@
-# Copyright 2017-2019 Intel Corporation and OPNFV. All rights reserved.
+# Copyright 2017-2021 Intel Corporation, Anuket and others.
+# All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,17 +15,12 @@
 #
 
 FROM centos:8
-RUN dnf update -y && \
-        dnf install -y which sudo git && \
-        dnf clean all && \
-        git config --global http.sslVerify false
 
+ARG COLLECTD_FLAVOR=latest
+ARG WITH_DPDK=y
 ENV DOCKER y
-ENV COLLECTD_FLAVOR latest
-ENV WITH_DPDK y
 ENV repos_dir /src
 
-WORKDIR ${repos_dir}
 RUN mkdir -p ${repos_dir}/barometer
 COPY . ${repos_dir}/barometer
 
diff --git a/docker/barometer-collectd/Dockerfile b/docker/barometer-collectd/Dockerfile
index ad4a1579..e263e97f 100644
--- a/docker/barometer-collectd/Dockerfile
+++ b/docker/barometer-collectd/Dockerfile
@@ -1,4 +1,5 @@
-# Copyright 2017-2019 Intel Corporation and OPNFV. All rights reserved.
+# Copyright 2017-2021 Intel Corporation, Anuket and others.
+# All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 
 FROM centos:8
 RUN dnf update -y && \
-        dnf install -y which sudo git && \
+        dnf install -y which sudo git-core && \
         dnf clean all && \
         git config --global http.sslVerify false