Merge ~nicolasbock/stsstack-bundles:paths into stsstack-bundles:master

[Nicolas Bock]

[Heather Lemon (hypothetical-lemon)]

review: Approve

[Edward Hope-Morley (hopem)]

I'm not clear why you would want to run tools/upload_octavia_amphora_image.sh from "anywhere" since it only relevant (a) for openstack deployments and (b) if you have sources novarc that is in the openstack module. If you use it from outside you are more likely to be using the wrong credentials. Maybe I'm missing a use-case?

[Nicolas Bock (nicolasbock)]

Maybe "anywhere" is a bit of an overstatement. The situation where this arose was that Heather was in the 'tools' directory and couldn't run the script. So maybe we don't want to run this from anywhere, but I think it would be nice if the script wasn't picky in terms of where you are when you run it. Does that clarify the use case a little bit?

[Edward Hope-Morley (hopem)]

yeah ok that makes sense, thanks for clarifying

review: Approve

diff --git a/openstack/tools/setup_tempest.sh b/openstack/tools/setup_tempest.sh
index 487706b..cfacc17 100755
--- a/openstack/tools/setup_tempest.sh
+++ b/openstack/tools/setup_tempest.sh
@@ -1,6 +1,9 @@
-set -x -e
-source ./profiles/common
-source novarc
+set -x -u -e
+
+scriptpath=$(readlink --canonicalize $(dirname $0))
+
+source ${scriptpath}/../profiles/common
+source ${scriptpath}/../novarc
 
 # Gather vars for tempest template
 # TODO: remove fallbacks once we move to queens (they are there for clients still on ocata)
diff --git a/openstack/tools/upload_octavia_amphora_image.sh b/openstack/tools/upload_octavia_amphora_image.sh
index 21d8e7f..0219089 100755
--- a/openstack/tools/upload_octavia_amphora_image.sh
+++ b/openstack/tools/upload_octavia_amphora_image.sh
@@ -6,6 +6,8 @@
 declare release=
 declare image_format=
 
+scriptpath=$(readlink --canonicalize $(dirname $0))
+
 while (( $# > 0 )); do
   case $1 in
     --release|-r)
@@ -44,7 +46,8 @@ if [[ -z ${release} ]]; then
   exit 1
 fi
 
-set -x
+set -x -e -u
+
 source ~/novarc
 tmp=`mktemp`
 source ~/novarc
@@ -54,8 +57,8 @@ img="`egrep "${ts}.+$release" $tmp| tail -n 1`"
 rm $tmp
 
 export SWIFT_IP="10.230.19.58"
-. ./profiles/common
-source novarc
+source ${scriptpath}/../profiles/common
+source ${scriptpath}/../novarc
 upload_image swift octavia-amphora $img $image_format
 
 image_name=octavia-amphora