openstack/kolla
Code Issues Proposed changes

Merge "Fix if $user is root at extend_start"

Browse Source
This commit is contained in:
Jenkins
2017-05-12 16:04:59 +00:00
committed by Gerrit Code Review
parent 4b5b38eebd 45c54d7959
commit e1eb50cec8
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/cinder/cinder-api/extend_start.sh
View File

@@ -9,7 +9,7 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
fi
# Assume the service runs on top of Apache when user is root
if [[ $USER == 'root' ]]; then
if [[ "$(whoami)" == 'root' ]]; then
# NOTE(pbourke): httpd will not clean up after itself in some cases which
# results in the container not being able to restart. (bug #1489676, 1557036)
if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then

2
docker/heat/heat-base/extend_start.sh
View File

@@ -8,7 +8,7 @@ if [[ $(stat -c %a /var/log/kolla/heat) != "755" ]]; then
fi
# Assume the service runs on top of Apache when user is root
if [[ $USER == 'root' ]]; then
if [[ "$(whoami)" == 'root' ]]; then
# NOTE(pbourke): httpd will not clean up after itself in some cases which
# results in the container not being able to restart. (bug #1489676, 1557036)
if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then

2
docker/nova/nova-api/extend_start.sh
View File

@@ -10,7 +10,7 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
fi
# Assume the service runs on top of Apache when user is root
if [[ $USER == 'root' ]]; then
if [[ "$(whoami)" == 'root' ]]; then
# NOTE(pbourke): httpd will not clean up after itself in some cases which
# results in the container not being able to restart. (bug #1489676, 1557036)
if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then

2
docker/zaqar/extend_start.sh
View File

@@ -8,7 +8,7 @@ if [[ $(stat -c %a /var/log/kolla/zaqar) != "755" ]]; then
fi
# Assume the service runs on top of Apache when user is root
if [[ $USER == 'root' ]]; then
if [[ "$(whoami)" == 'root' ]]; then
# NOTE(pbourke): httpd will not clean up after itself in some cases which
# results in the container not being able to restart. (bug #1489676, 1557036)
if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then