diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2019-02-21 16:46:21 +0000 |
|---|---|---|
| committer | Pedro Alvarez Piedehierro <pedro.alvarez@codethink.co.uk> | 2019-03-28 16:26:22 +0000 |
| commit | 35394e25a33c6bbfdc2e1853adfa8f2a1a5614c1 (patch) | |
| tree | bf45e7133842a6848199ebc3b3b35b2e7fbc7b92 /docker/fluentd | |
| parent | 83e8be4f0597c4572f58a1052010d3660064cdb9 (diff) | |
| download | kolla-35394e25a33c6bbfdc2e1853adfa8f2a1a5614c1.tar.gz kolla-35394e25a33c6bbfdc2e1853adfa8f2a1a5614c1.zip | |
Install fluentd gem on debian/ubuntu for non x86_64
The package used to install fluentd on debian/ubuntu is not
available for architectures other than x86_64. For those cases
install fluentd as a gem until the package 'td-agent' is available
for more architectures.
Change-Id: Ic1b25b37d06b429a112f1418a79d385d505bb1e9
Diffstat (limited to 'docker/fluentd')
| -rw-r--r-- | docker/fluentd/Dockerfile.j2 | 26 | ||||
| -rw-r--r-- | docker/fluentd/extend_start.sh | 2 |
2 files changed, 23 insertions, 5 deletions
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 27dee33af..ca1390e27 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -27,19 +27,29 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% elif base_package_type == 'deb' %} - {{ macros.configure_user(name='td-agent', groups='mysql') }} {% set fluentd_packages = [ 'g++', 'make', 'ruby', 'ruby-dev', - 'td-agent' ] %} + {% if base_arch == 'x86_64' %} + {{ macros.configure_user(name='td-agent', groups='mysql') }} + {% set fluentd_packages = fluentd_packages + [ + 'td-agent' + ] %} + {% else %} + {{ macros.configure_user(name='fluentd', groups='mysql') }} + {% endif %} {% endif %} {{ macros.install_packages(fluentd_packages | customizable("packages")) }} +{% if base_package_type == 'deb' and base_arch != 'x86_64' %} +RUN /usr/bin/gem install fluentd --no-rdoc --no-ri +{% endif %} + # Distro specific files and operations {% if base_package_type == 'rpm' %} COPY rpm_fluentd_sudoers /etc/sudoers.d/kolla_fluentd_sudoers @@ -47,11 +57,19 @@ RUN chmod 440 /etc/sudoers.d/kolla_fluentd_sudoers \ && mkdir -p /var/run/fluentd \ && chown -R fluentd: /etc/fluentd /var/run/fluentd {% elif base_package_type == 'deb' %} + {% if base_arch == 'x86_64' %} COPY fluentd_sudoers /etc/sudoers.d/kolla_fluentd_sudoers RUN chmod 440 /etc/sudoers.d/kolla_fluentd_sudoers \ && sed -i -e "s/USER=td-agent/USER=root/" -e "s/GROUP=td-agent/GROUP=root/" /etc/init.d/td-agent \ && rm -f /etc/td-agent/td-agent.conf \ && chown -R td-agent: /etc/td-agent + {% else %} +COPY rpm_fluentd_sudoers /etc/sudoers.d/kolla_fluentd_sudoers +RUN chmod 440 /etc/sudoers.d/kolla_fluentd_sudoers \ + && mkdir -p /etc/fluentd \ + && mkdir -p /var/run/fluentd \ + && chown -R fluentd: /etc/fluentd /var/run/fluentd + {% endif %} {% endif %} @@ -90,8 +108,8 @@ RUN tar -xvf /tmp/fluentd-monasca.tar.gz -C /tmp \ {% block fluentd_footer %}{% endblock %} {% block footer %}{% endblock %} -{% if base_package_type == 'rpm' %} +{% if base_package_type == 'rpm' or (base_package_type == 'deb' and base_arch != 'x86_64') %} USER fluentd -{% elif base_package_type == 'deb' %} +{% elif base_package_type == 'deb' and base_arch == 'x86_64' %} USER td-agent {% endif %} diff --git a/docker/fluentd/extend_start.sh b/docker/fluentd/extend_start.sh index b2ace498e..93996766b 100644 --- a/docker/fluentd/extend_start.sh +++ b/docker/fluentd/extend_start.sh @@ -6,7 +6,7 @@ # 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_DISTRO}" =~ debian|ubuntu ]]; then +if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu && "${KOLLA_BASE_ARCH}" == "x86_64" ]]; then USERGROUP="td-agent:kolla" FLUENTD="td-agent" else |