diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-05-12 16:04:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-05-12 16:04:59 +0000 |
| commit | e1eb50cec82a815487038bdb08d4033ba3b506bd (patch) | |
| tree | b294e93e11795f8f492367a160a973f52916d6e1 /docker/cinder | |
| parent | 4b5b38eebdd874275ad15c3a979ac7b3d8e46c17 (diff) | |
| parent | 45c54d7959a04dd95e871d6d00dd0fb84a5126d0 (diff) | |
| download | kolla-e1eb50cec82a815487038bdb08d4033ba3b506bd.tar.gz kolla-e1eb50cec82a815487038bdb08d4033ba3b506bd.zip | |
Merge "Fix if $user is root at extend_start"
Diffstat (limited to 'docker/cinder')
| -rw-r--r-- | docker/cinder/cinder-api/extend_start.sh | 2 |
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 |