openstack/kolla
Code Issues Proposed changes

Make setup_docker.sh bashate compliant

Browse Source 
Change-Id: I60ea3b103d1ebe6f9e1b02ef8c91868d7538cdee
Partially-Implements: blueprint bashate-gate
This commit is contained in:
Steven Dake 2015-05-28 08:33:06 -07:00
parent 70b8f4064e
commit 83b2e10409
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/setup_docker.sh
View File

@ -9,7 +9,7 @@ set -xu
DOCKER_MIN_VERSION=1.6.0 DOCKER_MIN_VERSION=1.6.0
function check_prerequisites() { function check_prerequisites {
if [[ $EUID -ne 0 ]]; then if [[ $EUID -ne 0 ]]; then
echo "You must execute this script as root." 1>&2 echo "You must execute this script as root." 1>&2
exit 1 exit 1
@ -24,7 +24,7 @@ function check_prerequisites() {
fi fi
} }
function check_docker_version() { function check_docker_version {
local docker_version local docker_version
local result local result
if type docker &>/dev/null; then if type docker &>/dev/null; then
@ -37,7 +37,7 @@ function check_docker_version() {
return 1 return 1
} }
function start_docker() { function start_docker {
pkill -x -9 docker pkill -x -9 docker
if check_docker_version; then if check_docker_version; then
docker -d &>/dev/null & docker -d &>/dev/null &
@ -48,7 +48,7 @@ function start_docker() {
fi fi
} }
function create_group() { function create_group {
getent group docker getent group docker
result=$? result=$?
if [ $result -eq 0 ]; then # 0: key already exists, nothing to do if [ $result -eq 0 ]; then # 0: key already exists, nothing to do