Merge "bump td-agent lts from v4 to v5"17.0.0.0rc1

5 files changed, 14 insertions, 21 deletions

diff --git a/docker/base/td.repo b/docker/base/td.repo
index cea423169..e06b62991 100644
--- a/docker/base/td.repo
+++ b/docker/base/td.repo
@@ -1,6 +1,6 @@
-[treasuredata]
-name=TreasureData
-baseurl=http://packages.treasuredata.com/4/redhat/$releasever/$basearch
+[fluent-package-lts]
+name=Fluentd Project
+baseurl=https://packages.treasuredata.com/lts/5/redhat/$releasever/$basearch
 gpgcheck=1
 gpgkey=https://packages.treasuredata.com/GPG-KEY-td-agent
 enabled=0
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2
index 5195b175d..a992384f4 100644
--- a/docker/fluentd/Dockerfile.j2
+++ b/docker/fluentd/Dockerfile.j2
@@ -1,23 +1,23 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 
-{% set fluentd_user = 'td-agent' %}
+{% set fluentd_user = 'fluentd' %}
 
 {% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" fluentd_binary="td-agent" fluentd_user="{{ fluentd_user }}"
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" fluentd_binary="fluentd" fluentd_user="{{ fluentd_user }}"
 {% endblock %}
 
 {% block fluentd_header %}{% endblock %}
 
 {% import "macros.j2" as macros with context %}
 
-{{ macros.enable_extra_repos(['td-agent']) }}
+{{ macros.enable_extra_repos(['fluentd']) }}
 
 {% if base_package_type == 'rpm' %}
 
     {% set fluentd_packages = [
         'gcc-c++',
         'make',
-        'td-agent',
+        'fluent-package',
     ] %}
 
 {% elif base_package_type == 'deb' %}
@@ -25,7 +25,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% set fluentd_packages = [
         'g++',
         'make',
-        'td-agent',
+        'fluent-package',
     ] %}
 
 {% endif %}
diff --git a/docker/fluentd/extend_start.sh b/docker/fluentd/extend_start.sh
index 73f3d145e..6b304b92c 100644
--- a/docker/fluentd/extend_start.sh
+++ b/docker/fluentd/extend_start.sh
@@ -6,23 +6,15 @@
 # Also set the setgid permission on the /var/log/kolla directory so that new
 # files and sub-directories in that directory inherit its group id ("kolla").
 
-if [[ "${KOLLA_BASE_ARCH}" == "x86_64" && "${KOLLA_BASE_DISTRO}" != "debian" ]]; then
-    USERGROUP="td-agent:kolla"
-    FLUENTD="td-agent"
-else
-    USERGROUP="fluentd:kolla"
-    FLUENTD="fluentd"
-fi
-
 if [ ! -d /var/log/kolla ]; then
     mkdir -p /var/log/kolla
 fi
-if [[ $(stat -c %U:%G /var/log/kolla) != "${USERGROUP}" ]]; then
-    sudo chown ${USERGROUP} /var/log/kolla
+if [[ $(stat -c %U:%G /var/log/kolla) != "fluentd:kolla" ]]; then
+    sudo chown fluentd:kolla /var/log/kolla
 fi
 if [[ $(stat -c %a /var/log/kolla) != "2775" ]]; then
     sudo chmod 2775 /var/log/kolla
 fi
-if [[ (-d /var/lib/${FLUENTD}) && ($(stat -c %U:%G /var/lib/${FLUENTD}) != "${USERGROUP}") ]]; then
-    sudo chown ${USERGROUP} /var/lib/${FLUENTD}
+if [[ (-d /var/lib/fluentd) && ($(stat -c %U:%G /var/lib/fluentd) != "fluentd:kolla") ]]; then
+    sudo chown fluentd:kolla /var/lib/fluentd
 fi
diff --git a/docker/fluentd/fluentd_sudoers b/docker/fluentd/fluentd_sudoers
index 7ff79e7f4..25ca93f5a 100644
--- a/docker/fluentd/fluentd_sudoers
+++ b/docker/fluentd/fluentd_sudoers
@@ -2,6 +2,7 @@
 %kolla ALL=(root) NOPASSWD: /bin/chown td-agent\:kolla /var/log/kolla, /usr/bin/chown td-agent\:kolla /var/log/kolla
 %kolla ALL=(root) NOPASSWD: /bin/chown fluentd\:kolla /var/lib/fluentd, /usr/bin/chown fluentd\:kolla /var/lib/fluentd
 %kolla ALL=(root) NOPASSWD: /bin/chown td-agent\:kolla /var/lib/td-agent, /usr/bin/chown td-agent\:kolla /var/lib/td-agent
+%kolla ALL=(root) NOPASSWD: /bin/chown fluentd\:kolla /var/lib/td-agent, /usr/bin/chown fluentd\:kolla /var/lib/td-agent
 %kolla ALL=(root) NOPASSWD: /bin/chmod 2775 /var/log/kolla, /usr/bin/chmod 2775 /var/log/kolla
 %kolla ALL=(root) NOPASSWD: /bin/chmod 2775 /var/lib/fluentd, /usr/bin/chmod 2775 /var/lib/fluentd
 %kolla ALL=(root) NOPASSWD: /bin/chmod 2775 /var/lib/td-agent, /usr/bin/chmod 2775 /var/lib/td-agent
diff --git a/docker/macros.j2 b/docker/macros.j2
index 9992aa11d..257c7b58e 100644
--- a/docker/macros.j2
+++ b/docker/macros.j2
@@ -61,7 +61,7 @@ RUN usermod --append --home {{ homedir }} --groups kolla {{ name }} \
 {% macro install_fluent_plugins(plugins, chain=False) -%}
 {% if plugins is defined and plugins|length > 0 -%}
     {% if not chain -%} RUN {% endif -%}
-    ulimit -n 1024 && td-agent-gem install {{ plugins | join(' ') }}
+    ulimit -n 1024 && fluent-gem install {{ plugins | join(' ') }}
 {%- endif %}
 {%- endmacro %}