diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-08 15:50:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-08 15:50:07 +0000 |
| commit | 52d8b978b5bf8d8df161805ae5670ee02b6cf4d7 (patch) | |
| tree | 15e44d21f9446ce56aa590f3be2e8e71d4dfac6e /tools | |
| parent | e08b9d001026ffdaae9b3afe73308eb5e4414c76 (diff) | |
| parent | 83b2e10409f4297f0333d46d1ab1dba0960f3cbe (diff) | |
| download | kolla-52d8b978b5bf8d8df161805ae5670ee02b6cf4d7.tar.gz kolla-52d8b978b5bf8d8df161805ae5670ee02b6cf4d7.zip | |
Merge "Make setup_docker.sh bashate compliant"
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/setup_docker.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/setup_docker.sh b/tools/setup_docker.sh index 6be1ebeec..b613713c2 100755 --- a/tools/setup_docker.sh +++ b/tools/setup_docker.sh @@ -9,7 +9,7 @@ set -xu DOCKER_MIN_VERSION=1.6.0 -function check_prerequisites() { +function check_prerequisites { if [[ $EUID -ne 0 ]]; then echo "You must execute this script as root." 1>&2 exit 1 @@ -24,7 +24,7 @@ function check_prerequisites() { fi } -function check_docker_version() { +function check_docker_version { local docker_version local result if type docker &>/dev/null; then @@ -37,7 +37,7 @@ function check_docker_version() { return 1 } -function start_docker() { +function start_docker { pkill -x -9 docker if check_docker_version; then docker -d &>/dev/null & @@ -48,7 +48,7 @@ function start_docker() { fi } -function create_group() { +function create_group { getent group docker result=$? if [ $result -eq 0 ]; then # 0: key already exists, nothing to do |