aboutsummaryrefslogtreecommitdiff
path: root/docker/fluentd/extend_start.sh
diff options
context:
space:
mode:
authorJuan Badia Payno <jbadiapa@redhat.com>2017-05-23 14:34:00 +0200
committerMartin Mágr <mmagr@redhat.com>2017-07-31 16:10:17 +0200
commit00032822535e0aca208263aa2bd84be83132d60a (patch)
treecb273ead7a63db725eca6532016af1cbd5e9c1b9 /docker/fluentd/extend_start.sh
parentc89ed0842948e4afa2b100a542e804706f3217db (diff)
downloadkolla-00032822535e0aca208263aa2bd84be83132d60a.tar.gz
kolla-00032822535e0aca208263aa2bd84be83132d60a.zip
Use community fluentd packages for CentOS/RHEL/Oraclelinux
-Use the fluentd package on the CentOS OpsTools repository created by the CentOS OpsTools SIG. -The user changed to fluentd for CentOS/RHEL/Oraclelinux -Plugins are installed as gems on CentOS/RHEL/Oraclelinux Change-Id: I4802618373cfa53d67d1dfe65be7abe1950b3d04
Diffstat (limited to 'docker/fluentd/extend_start.sh')
-rw-r--r--docker/fluentd/extend_start.sh20
1 files changed, 16 insertions, 4 deletions
diff --git a/docker/fluentd/extend_start.sh b/docker/fluentd/extend_start.sh
index bcdbed09d..b2ace498e 100644
--- a/docker/fluentd/extend_start.sh
+++ b/docker/fluentd/extend_start.sh
@@ -5,12 +5,24 @@
#
# 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 [[ $(stat -c %U:%G /var/log/kolla) != "td-agent:kolla" ]]; then
- sudo chown td-agent:kolla /var/log/kolla
+
+if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; 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
fi
if [[ $(stat -c %a /var/log/kolla) != "2775" ]]; then
sudo chmod 2775 /var/log/kolla
fi
-if [[ $(stat -c %U:%G /var/lib/td-agent) != "td-agent:kolla" ]]; then
- sudo chown td-agent:kolla /var/lib/td-agent
+if [[ $(stat -c %U:%G /var/lib/${FLUENTD}) != "${USERGROUP}" ]]; then
+ sudo chown ${USERGROUP} /var/lib/${FLUENTD}
fi