From 77a67deeb6c223d1e5a27dd1c6d7d3d02579a4bb Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Tue, 8 Mar 2016 22:13:40 -0700 Subject: Rename validate-docker-execute with .sh extension TrivialFix Change-Id: I3ad67fd802f7fe3ed7deb88eddebe520ff410a4f --- tools/cleanup-host | 2 +- tools/cleanup-images | 2 +- tools/validate-docker-execute | 14 -------------- tools/validate-docker-execute.sh | 14 ++++++++++++++ 4 files changed, 16 insertions(+), 16 deletions(-) delete mode 100755 tools/validate-docker-execute create mode 100755 tools/validate-docker-execute.sh diff --git a/tools/cleanup-host b/tools/cleanup-host index 3cc4ae23d..18353c7b1 100755 --- a/tools/cleanup-host +++ b/tools/cleanup-host @@ -3,7 +3,7 @@ # Move to top level directory REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')") cd "$(dirname "$REAL_PATH")/.." -. tools/validate-docker-execute +. tools/validate-docker-execute.sh # Spawning the neutron-agents container leaves artifacts on the host. # This script removes these artifacts. diff --git a/tools/cleanup-images b/tools/cleanup-images index 871afd1d1..065005220 100755 --- a/tools/cleanup-images +++ b/tools/cleanup-images @@ -4,7 +4,7 @@ REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')") cd "$(dirname "$REAL_PATH")/.." -. tools/validate-docker-execute +. tools/validate-docker-execute.sh IMAGES=`docker images -a -q` if [[ -z "$IMAGES" ]]; then diff --git a/tools/validate-docker-execute b/tools/validate-docker-execute deleted file mode 100755 index 3dda59e86..000000000 --- a/tools/validate-docker-execute +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -# -# This script can be used to check user privilege to execute -# docker commands - -function check_dockerexecute { - docker ps &>/dev/null - return_val=$? - if [ $return_val -ne 0 ]; then - echo "User $USER can't seem to run Docker commands. Verify product documentation to allow user to execute docker commands" 1>&2 - exit 1 - fi -} -check_dockerexecute diff --git a/tools/validate-docker-execute.sh b/tools/validate-docker-execute.sh new file mode 100755 index 000000000..3dda59e86 --- /dev/null +++ b/tools/validate-docker-execute.sh @@ -0,0 +1,14 @@ +#!/bin/bash +# +# This script can be used to check user privilege to execute +# docker commands + +function check_dockerexecute { + docker ps &>/dev/null + return_val=$? + if [ $return_val -ne 0 ]; then + echo "User $USER can't seem to run Docker commands. Verify product documentation to allow user to execute docker commands" 1>&2 + exit 1 + fi +} +check_dockerexecute -- cgit v1.2.3