Temperorily revert "Rename collectd container to barometer-collectd-latest"

This reverts commit 59338794c8ae8ff82c00dc14ea47a9279cc213d4.
The reason for reverting is that there is not yet a container image available
on Dockerhub for barometer-collectd-latest

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

diff --git a/docker/README_collectd b/docker/README_collectd
index cf49710..baa0ff6 100644 (file)
--- 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 17b53c3..e254c26 100644 (file)
--- 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 797f973..c72aee4 100644 (file)
--- 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
similarity index 100%
rename from docker/ansible/roles/config_files/templates/latest/snmp_agent.conf.j2
rename to 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 90d6a4f..cebd0f4 100644 (file)
--- 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 a9f262e..49016d9 100644 (file)
--- 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
similarity index 93%
rename from docker/barometer-collectd-latest/Dockerfile
rename to docker/barometer-collectd-master/Dockerfile
index 43b0ab0..9637a48 100644 (file)
--- 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
similarity index 100%
rename from docker/barometer-collectd-latest/run_collectd.sh
rename to docker/barometer-collectd-master/run_collectd.sh

diff --git a/docs/release/userguide/installguide.docker.rst b/docs/release/userguide/installguide.docker.rst
index 9d5fb0c..4f01630 100644 (file)
--- a/docs/release/userguide/installguide.docker.rst
+++ b/docs/release/userguide/installguide.docker.rst
@@ -269,7 +269,7 @@ Collectd-barometer flavors
 Before starting to build and run the Collectd container, understand the available
 flavors of Collectd containers:
   * barometer-collectd - stable release, based on collectd 5.11
-  * barometer-collectd-latest - release based on collectd 'main' branch
+  * barometer-collectd-master - release based on collectd 'main' branch
   * barometer-collectd-experimental - release based on collectd 'main'
     branch that also includes set of experimental (not yet merged into upstream)
     pull requests
@@ -280,7 +280,7 @@ flavors of Collectd containers:
 
 Stable `barometer-collectd` container is intended for work in production
 environment as it is based on latest collectd official release.
-`barometer-collectd-latest` and `barometer-collectd-experimental` containers
+`Barometer-collectd-master` and `barometer-collectd-experimental` containers
 can be used in order to try new collectd features.
 All flavors are located in `barometer` git repository - respective Dockerfiles
 are stored in subdirectories of `docker/` directory
@@ -291,7 +291,7 @@ are stored in subdirectories of `docker/` directory
     $ git clone https://gerrit.opnfv.org/gerrit/barometer
     $ ls barometer/docker|grep collectd
     barometer-collectd
-    barometer-collectd-latest
+    barometer-collectd-master
     barometer-collectd-experimental
 
 .. note::
@@ -338,23 +338,23 @@ Output should contain a barometer-collectd image:
    hello-world                  latest              05a3bd381fc2        4 weeks ago         1.84kB
 
 .. note::
-   If you do not plan to use collectd-latest and collectd-experimental barometer
+   If you do not plan to use collectd-master and collectd-experimental barometer
    containers, then you can proceed directly to section `Run the collectd stable docker image`_
 
 
-Build collectd-latest container
+Build collectd-master container
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. code:: bash
 
     $ cd <BAROMETER_REPO_DIR>
-    $ sudo docker build -t opnfv/barometer-collectd-latest \
+    $ sudo docker build -t opnfv/barometer-collectd-master \
      --build-arg http_proxy=`echo $http_proxy` \
      --build-arg https_proxy=`echo $https_proxy` --network=host -f \
-     docker/barometer-collectd-latest/Dockerfile .
+     docker/barometer-collectd-master/Dockerfile .
 
 .. note::
-   For `barometer-collectd-latest` and `barometer-collectd-experimental` containers
+   For `barometer-collectd-master` and `barometer-collectd-experimental` containers
    proxy parameters should be passed only if system is behind an HTTP or HTTPS
    proxy server (same as for stable collectd container)
 
@@ -370,7 +370,7 @@ Build collectd-experimental container
      --network=host -f docker/barometer-collectd-experimental/Dockerfile .
 
 .. note::
-   For `barometer-collectd-latest` and `barometer-collectd-experimental` containers
+   For `barometer-collectd-master` and `barometer-collectd-experimental` containers
    proxy parameters should be passed only if system is behind an HTTP or HTTPS
    proxy server (same as for stable collectd container)
 
@@ -429,9 +429,9 @@ To make some changes when the container is running run:
 
    sudo docker exec -ti <CONTAINER ID> /bin/bash
 
-Run the barometer-collectd-latest docker image
+Run the barometer-collectd-master docker image
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Run command for `barometer-collectd-latest` container is very similar to command
+Run command for `barometer-collectd-master` container is very similar to command
 used for stable container - the only differences are name of the image
 and location of the sample configuration files(as different version of collectd
 plugins requiring different configuration files)
@@ -441,14 +441,14 @@ plugins requiring different configuration files)
 
    $ cd <BAROMETER_REPO_DIR>
    $ sudo docker run -ti --net=host -v \
-   `pwd`/src/collectd/collectd_sample_configs-latest:/opt/collectd/etc/collectd.conf.d \
+   `pwd`/src/collectd/collectd_sample_configs-master:/opt/collectd/etc/collectd.conf.d \
    -v /var/run:/var/run -v /tmp:/tmp -v /sys/fs/resctrl:/sys/fs/resctrl \
-   --privileged opnfv/barometer-collectd-latest
+   --privileged opnfv/barometer-collectd-master
 
 .. note::
    Barometer collectd docker images are sharing some directories with host
    (e.g. /tmp) therefore only one of collectd barometer flavors can be run
-   at a time. In other words, if you want to try `barometer-collectd-latest` or
+   at a time. In other words, if you want to try `barometer-collectd-master` or
    `barometer-collectd-experimental` image, please stop instance of
    `barometer-collectd(stable)` image first.
 
@@ -461,29 +461,29 @@ plugins requiring different configuration files)
 Run the barometer-collectd-experimental docker image
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Barometer-collectd-experimental container shares default configuration files
-with 'barometer-collectd-latest' equivalent but some of experimental pull
+with 'barometer-collectd-master' equivalent but some of experimental pull
 requests may require modified configuration. Additional configuration files that
 are required specifically by experimental container can be found in
 `docker/barometer-collectd-experimental/experimental-configs/`
 directory. Content of this directory (all \*.conf files) should be copied to
-`src/collectd/collectd_sample_configs-latest` directory before first run of
+`src/collectd/collectd_sample_configs-master` directory before first run of
 experimental container.
 
 .. code:: bash
 
    $ cd <BAROMETER_REPO_DIR>
    $ cp docker/barometer-collectd-experimental/experimental-configs/*.conf \
-     src/collectd/collectd_sample_configs-latest
+     src/collectd/collectd_sample_configs-master
 
 When configuration files are up to date for experimental container, it can be
-launched using following command (almost identical to run-command for
-``latest`` collectd container)
+launched using following command (almost identical to run-command for 'master'
+collectd container)
 
 .. code:: bash
 
    $ cd <BAROMETER_REPO_DIR>
    $ sudo docker run -ti --net=host -v \
-   `pwd`/src/collectd/collectd_sample_configs-latest:/opt/collectd/etc/collectd.conf.d \
+   `pwd`/src/collectd/collectd_sample_configs-master:/opt/collectd/etc/collectd.conf.d \
    -v /var/run:/var/run -v /tmp:/tmp -v /sys/fs/resctrl:/sys/fs/resctrl --privileged \
    opnfv/barometer-collectd-experimental
 

diff --git a/docs/release/userguide/installguide.oneclick.rst b/docs/release/userguide/installguide.oneclick.rst
index 4799472..61d561a 100644 (file)
--- a/docs/release/userguide/installguide.oneclick.rst
+++ b/docs/release/userguide/installguide.oneclick.rst
@@ -128,7 +128,6 @@ Edit inventory file
 Edit inventory file and add hosts:
 ``$barometer_dir/docker/ansible/default.inv``
 
-.. TODO:: Use include file directive to add the docker/ansible/default.inv file here
 .. code:: bash
 
     [collectd_hosts]
@@ -137,8 +136,8 @@ Edit inventory file and add hosts:
     [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/src/collectd/collectd_sample_configs-latest/csv.conf b/src/collectd/collectd_sample_configs-master/csv.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-latest/csv.conf
rename to src/collectd/collectd_sample_configs-master/csv.conf

diff --git a/src/collectd/collectd_sample_configs-latest/default_plugins.conf b/src/collectd/collectd_sample_configs-master/default_plugins.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-latest/default_plugins.conf
rename to src/collectd/collectd_sample_configs-master/default_plugins.conf

diff --git a/src/collectd/collectd_sample_configs-latest/dpdkevents.conf b/src/collectd/collectd_sample_configs-master/dpdkevents.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-latest/dpdkevents.conf
rename to src/collectd/collectd_sample_configs-master/dpdkevents.conf

diff --git a/src/collectd/collectd_sample_configs-latest/dpdkstat.conf b/src/collectd/collectd_sample_configs-master/dpdkstat.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-latest/dpdkstat.conf
rename to src/collectd/collectd_sample_configs-master/dpdkstat.conf

diff --git a/src/collectd/collectd_sample_configs-latest/exec.conf b/src/collectd/collectd_sample_configs-master/exec.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-latest/exec.conf
rename to src/collectd/collectd_sample_configs-master/exec.conf

diff --git a/src/collectd/collectd_sample_configs-latest/hugepages.conf b/src/collectd/collectd_sample_configs-master/hugepages.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-latest/hugepages.conf
rename to src/collectd/collectd_sample_configs-master/hugepages.conf

diff --git a/src/collectd/collectd_sample_configs-latest/intel_pmu.conf b/src/collectd/collectd_sample_configs-master/intel_pmu.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-latest/intel_pmu.conf
rename to src/collectd/collectd_sample_configs-master/intel_pmu.conf

diff --git a/src/collectd/collectd_sample_configs-latest/kafka.conf b/src/collectd/collectd_sample_configs-master/kafka.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-latest/kafka.conf
rename to src/collectd/collectd_sample_configs-master/kafka.conf

diff --git a/src/collectd/collectd_sample_configs-latest/mcelog.conf b/src/collectd/collectd_sample_configs-master/mcelog.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-latest/mcelog.conf
rename to src/collectd/collectd_sample_configs-master/mcelog.conf

diff --git a/src/collectd/collectd_sample_configs-latest/network.conf b/src/collectd/collectd_sample_configs-master/network.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-latest/network.conf
rename to src/collectd/collectd_sample_configs-master/network.conf

diff --git a/src/collectd/collectd_sample_configs-latest/ovs_events.conf b/src/collectd/collectd_sample_configs-master/ovs_events.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-latest/ovs_events.conf
rename to src/collectd/collectd_sample_configs-master/ovs_events.conf

diff --git a/src/collectd/collectd_sample_configs-latest/ovs_pmd_stats.sh b/src/collectd/collectd_sample_configs-master/ovs_pmd_stats.sh
similarity index 100%
rename from src/collectd/collectd_sample_configs-latest/ovs_pmd_stats.sh
rename to src/collectd/collectd_sample_configs-master/ovs_pmd_stats.sh

diff --git a/src/collectd/collectd_sample_configs-latest/ovs_stats.conf b/src/collectd/collectd_sample_configs-master/ovs_stats.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-latest/ovs_stats.conf
rename to src/collectd/collectd_sample_configs-master/ovs_stats.conf

diff --git a/src/collectd/collectd_sample_configs-latest/pcie_errors.conf b/src/collectd/collectd_sample_configs-master/pcie_errors.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-latest/pcie_errors.conf
rename to src/collectd/collectd_sample_configs-master/pcie_errors.conf

diff --git a/src/collectd/collectd_sample_configs-latest/prometheus.conf b/src/collectd/collectd_sample_configs-master/prometheus.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-latest/prometheus.conf
rename to src/collectd/collectd_sample_configs-master/prometheus.conf

diff --git a/src/collectd/collectd_sample_configs-latest/rdt.conf b/src/collectd/collectd_sample_configs-master/rdt.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-latest/rdt.conf
rename to src/collectd/collectd_sample_configs-master/rdt.conf

diff --git a/src/collectd/collectd_sample_configs-latest/snmp_agent.conf b/src/collectd/collectd_sample_configs-master/snmp_agent.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-latest/snmp_agent.conf
rename to src/collectd/collectd_sample_configs-master/snmp_agent.conf

diff --git a/src/collectd/collectd_sample_configs-latest/virt.conf b/src/collectd/collectd_sample_configs-master/virt.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-latest/virt.conf
rename to src/collectd/collectd_sample_configs-master/virt.conf

diff --git a/src/collectd/collectd_sample_configs-latest/write_notification.sh b/src/collectd/collectd_sample_configs-master/write_notification.sh
similarity index 100%
rename from src/collectd/collectd_sample_configs-latest/write_notification.sh
rename to src/collectd/collectd_sample_configs-master/write_notification.sh

diff --git a/src/package-list.mk b/src/package-list.mk
index 0e9b5ad..dce32cf 100644 (file)
--- a/src/package-list.mk
+++ b/src/package-list.mk
@@ -22,7 +22,7 @@ COLLECTD_URL ?= https://github.com/collectd/collectd
 
 # there are 3 collectd flavors:
 # -"stable" - based on stable collectd release
-# -"latest" - development version, based on main branch
+# -"master" - development version, based on main branch
 # -"experimental" - it is based on main branch as above and includes
 #                   set pull requests with experimental features
 ifeq ($(COLLECTD_FLAVOR), stable)
@@ -30,10 +30,10 @@ ifeq ($(COLLECTD_FLAVOR), stable)
        COLLECTD_TAG ?= collectd-5.11
        SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs
 else
-# 'latest' and 'experimental' collectd flavors are both using
+# 'master' and 'experimental' collectd flavors are both using
 # code from main branch
        COLLECTD_TAG ?= main
-       SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs-latest
+       SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs-master
 ifeq ($(COLLECTD_FLAVOR), experimental)
 # 'experimental' flavor is using additional Pull Requests that
 # are put on top of main release