openstack: Fix shebangs on openstack scripts

Many of the files in qa/qa_scripts/openstack had incorrect shebang
lines: the bang was missing.  This means that those scripts would
execute using the calling user's login shell, which is doubtless not
what the author intended.  Now they'll always use bash.

Two scripts do not need shebangs, because they contain only library
functions and don't execute anything.  I removed their shebangs.

Signed-off-by: Alan Somers <asomers@gmail.com>

diff --git a/qa/qa_scripts/openstack/ceph_install.sh b/qa/qa_scripts/openstack/ceph_install.sh
index 51294d1cd0b5d9b68ddd1af570d6b515841c6822..47831bd03091690ac511a9bb6c1d46a5dc57a87a 100755 (executable)
--- a/qa/qa_scripts/openstack/ceph_install.sh
+++ b/qa/qa_scripts/openstack/ceph_install.sh
@@ -1,7 +1,8 @@
-#/bin/bash -fv
+#!/usr/bin/env bash
 #
 # Install a simple ceph cluster upon which openstack images will be stored.
 #
+set -fv
 ceph_node=${1}
 source copy_func.sh
 copy_file files/$OS_CEPH_ISO $ceph_node .

diff --git a/qa/qa_scripts/openstack/connectceph.sh b/qa/qa_scripts/openstack/connectceph.sh
index 47162ca049e57485e86e0802e855602cb8a48e06..2d70df7ffb36642e24256012e49fd3326a0a2e19 100755 (executable)
--- a/qa/qa_scripts/openstack/connectceph.sh
+++ b/qa/qa_scripts/openstack/connectceph.sh
@@ -1,4 +1,4 @@
-#/bin/bash -fv
+#!/usr/bin/env bash
 #
 # Connect openstack node just installed to a ceph cluster.
 #
@@ -9,6 +9,7 @@
 # The directory named files contains templates for the /etc/glance/glance-api.conf,
 # /etc/cinder/cinder.conf, /etc/nova/nova.conf Openstack files
 #
+set -fv
 source ./copy_func.sh
 source ./fix_conf_file.sh
 openstack_node=${1}

diff --git a/qa/qa_scripts/openstack/copy_func.sh b/qa/qa_scripts/openstack/copy_func.sh
index 29589765474ed6dc37399dd719a4ee623e7566f5..5719802622b2784a48b4c9cab98585d1f8bb08cc 100755 (executable)
--- a/qa/qa_scripts/openstack/copy_func.sh
+++ b/qa/qa_scripts/openstack/copy_func.sh
@@ -1,4 +1,3 @@
-#/bin/bash -fv
 #
 # copy_file(<filename>, <node>, <directory>, [<permissions>], [<owner>]
 # 

diff --git a/qa/qa_scripts/openstack/fix_conf_file.sh b/qa/qa_scripts/openstack/fix_conf_file.sh
index bff2ef3d1c26aeea0d17446ab02e8c6cc5895bee..8ccd2724906c24f7c2fd353da17d79215fcffb13 100755 (executable)
--- a/qa/qa_scripts/openstack/fix_conf_file.sh
+++ b/qa/qa_scripts/openstack/fix_conf_file.sh
@@ -1,4 +1,3 @@
-#/bin/bash -fv
 source ./copy_func.sh
 #
 # Take a templated file, modify a local copy, and write it to the

diff --git a/qa/qa_scripts/openstack/image_create.sh b/qa/qa_scripts/openstack/image_create.sh
index 4252dd8837aefb794ab8cbd8012da928d72bb03a..ee7f61f3b2f720b806416b8b2531a87e84b6d61d 100755 (executable)
--- a/qa/qa_scripts/openstack/image_create.sh
+++ b/qa/qa_scripts/openstack/image_create.sh
@@ -1,7 +1,8 @@
-#/bin/bash -fv
+#!/usr/bin/env bash
 #
 # Set up a vm on packstack.  Use the iso in RHEL_ISO (defaults to home dir)
 #
+set -fv
 source ./copy_func.sh
 source ./fix_conf_file.sh
 openstack_node=${1}

diff --git a/qa/qa_scripts/openstack/openstack.sh b/qa/qa_scripts/openstack/openstack.sh
index 986fce91787494753e263bbf335342986f2cca0f..1c1e6c00f2fb52b5aa55825da48fc955f2ae9ed0 100755 (executable)
--- a/qa/qa_scripts/openstack/openstack.sh
+++ b/qa/qa_scripts/openstack/openstack.sh
@@ -1,4 +1,4 @@
-#/bin/bash -fv
+#!/usr/bin/env bash
 #
 # Install Openstack.
 #     Usage: openstack <openstack-site> <ceph-monitor>
@@ -14,6 +14,7 @@
 # The files directory contains files to be copied to remote sites.
 #
 
+set -fv
 source ./copy_func.sh
 source ./fix_conf_file.sh
 openstack_node=${1}

diff --git a/qa/qa_scripts/openstack/packstack.sh b/qa/qa_scripts/openstack/packstack.sh
index 6432dd56d624147c24732b407a0e2cd5cc358090..3f891f98c20f429256edff3681678cd81f72e4ee 100755 (executable)
--- a/qa/qa_scripts/openstack/packstack.sh
+++ b/qa/qa_scripts/openstack/packstack.sh
@@ -1,4 +1,4 @@
-#/bin/bash -fv
+#!/usr/bin/env bash
 #
 # Install openstack by running packstack.
 #
@@ -7,6 +7,7 @@
 #
 # The directory named files contains a template for the kilo.conf file used by packstack.
 #
+set -fv
 source ./copy_func.sh
 source ./fix_conf_file.sh
 openstack_node=${1}