[container][latest] Rename and update barometer-collectd-latest

Collectd changed the upstream default to main, and Barometer added a few
changes to incorporate this. One change was renaming the
`barometer-collectd-master` container to `barometer-collectd-latest`, since
`barometer-collectd-main` didn't make sense semantically, as we use the
stable container as the "main" reference.

At the time, we didn't have the changes made in releng to build the new
container, so container renaming was paused.
Now that the change is merged in releng (and has been for a while), and
the containers are being updated, this change should happen, so that the
container gets published.

Signed-off-by: Emma Foley <efoley@redhat.com>
Change-Id: I4ee91c289b9e7477157bea148452be58343dc733

2 files changed, 0 insertions, 61 deletions

diff --git a/docker/barometer-collectd-master/Dockerfile b/docker/barometer-collectd-master/Dockerfile
deleted file mode 100644
index 9637a486..00000000
--- a/docker/barometer-collectd-master/Dockerfile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2017-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.
-#
-
-FROM centos:7
-RUN yum update -y && \
-        yum install -y which sudo git && \
-        yum clean all && \
-        git config --global http.sslVerify false
-
-ENV DOCKER y
-ENV COLLECTD_FLAVOR master
-ENV WITH_DPDK y
-ENV repos_dir /src
-ENV openstack_plugins /src/barometer/src/collectd-openstack-plugins
-
-WORKDIR ${repos_dir}
-RUN mkdir -p ${repos_dir}/barometer
-COPY . ${repos_dir}/barometer
-
-WORKDIR ${repos_dir}/barometer/systems
-RUN sh ./build_base_machine.sh && \
-        useradd -ms /bin/bash collectd_exec && \
-        echo "collectd_exec ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
-
-WORKDIR ${openstack_plugins}
-RUN make && \
-        pip install --upgrade pip && \
-        pip install -r ${openstack_plugins}/collectd-openstack-plugins/requirements.txt
-
-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-master/run_collectd.sh b/docker/barometer-collectd-master/run_collectd.sh
deleted file mode 100644
index 5920248a..00000000
--- a/docker/barometer-collectd-master/run_collectd.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# Copyright 2016-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.
-#
-/opt/collectd/sbin/collectd -f