diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-06 10:33:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-06 10:33:49 +0000 |
| commit | 481843b80c97bb35aaa0134f60ea07266337fc2a (patch) | |
| tree | 7940eed7f491494110a18bced413d9e4d410c274 /docker/fluentd/extend_start.sh | |
| parent | 90892a25bd9aa96d7c070e49b0afbcee9bf5fca7 (diff) | |
| parent | ef8d7a27ab5b7d6fce8a060b1bc2709b0d1bbb98 (diff) | |
| download | kolla-481843b80c97bb35aaa0134f60ea07266337fc2a.tar.gz kolla-481843b80c97bb35aaa0134f60ea07266337fc2a.zip | |
Merge "Change fluentd to td-agent on CentOS"
Diffstat (limited to 'docker/fluentd/extend_start.sh')
| -rw-r--r-- | docker/fluentd/extend_start.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/fluentd/extend_start.sh b/docker/fluentd/extend_start.sh index 93996766b..73f3d145e 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 && "${KOLLA_BASE_ARCH}" == "x86_64" ]]; then +if [[ "${KOLLA_BASE_ARCH}" == "x86_64" && "${KOLLA_BASE_DISTRO}" != "debian" ]]; then USERGROUP="td-agent:kolla" FLUENTD="td-agent" else @@ -23,6 +23,6 @@ fi if [[ $(stat -c %a /var/log/kolla) != "2775" ]]; then sudo chmod 2775 /var/log/kolla fi -if [[ $(stat -c %U:%G /var/lib/${FLUENTD}) != "${USERGROUP}" ]]; then +if [[ (-d /var/lib/${FLUENTD}) && ($(stat -c %U:%G /var/lib/${FLUENTD}) != "${USERGROUP}") ]]; then sudo chown ${USERGROUP} /var/lib/${FLUENTD} fi |