aboutsummaryrefslogtreecommitdiff
path: root/docker/cinder
diff options
context:
space:
mode:
authoregonzalez90 <dabarren@gmail.com>2017-05-12 12:56:13 +0100
committerEduardo Gonzalez <dabarren@gmail.com>2017-05-12 12:40:52 +0000
commit45c54d7959a04dd95e871d6d00dd0fb84a5126d0 (patch)
tree67e27ca246fff956b54a851d45d422d692c66074 /docker/cinder
parent2e438918384447d52c958d61b9a377c375ec932b (diff)
downloadkolla-45c54d7959a04dd95e871d6d00dd0fb84a5126d0.tar.gz
kolla-45c54d7959a04dd95e871d6d00dd0fb84a5126d0.zip
Fix if $user is root at extend_start
In ubuntu is not evaluating correctly if $user == root check at extend_start. Changing to "$(whoami)" == 'root' fixes the issue Change-Id: I296a1f98764cdfa09650c483bc7beba53e6bdba4 Closes-Bug: #1690360
Diffstat (limited to 'docker/cinder')
-rw-r--r--docker/cinder/cinder-api/extend_start.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/cinder/cinder-api/extend_start.sh b/docker/cinder/cinder-api/extend_start.sh
index a92cd0134..f56c0cd5e 100644
--- a/docker/cinder/cinder-api/extend_start.sh
+++ b/docker/cinder/cinder-api/extend_start.sh
@@ -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