Rework TOP_DIR logic

Currently, we use a simple logic for the client scripts to find
libraries, configuration files, etc. We know they will be copied to the
autostart directory from where TOP_DIR is one step up. If a user ever
tried to run a script in its original location (e.g. in scripts/ubuntu),
this logic would fail.

This has been a theoretical problem as long as users just used osbash.sh
or st.py to run the scripts. But if users would like to run extra
scripts, logging in to the nodes and running the scripts where they
find them would be the most natural way to do it.

Right now, the main use case is the heat service which is not installed
by default but can be installed at a later time if so desired -- with
the gotcha described above.

As more services are becoming optional add-ons to the install-guide,
this becomes an issue.

This patch installs a new logic: if a script finds a file named
TOP_DIR in its parent dir, it will use the file's contents as a
pointer to the TOP_DIR location.

TOP_DIR is a file rather than a symlink because the file needs to
work on Windows file systems as well.

The file lives in the parent directory rather than the script directory
because that reduces the number of such files that are required. This
becomes more relevant once we store additional services along with their
supporting files in extras/<service_name>/.

Change-Id: Ib0ccb108e5246ff8e06d87730ce11704d719fb75

labs/osbash/extras/TOP_DIR

@@ -0,0 +1 @@
+..

labs/osbash/scripts/TOP_DIR

@@ -0,0 +1 @@
+..

labs/osbash/scripts/centos/yum_init.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -o errexit -o nounset
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/openstack"
 # Pick up VM_PROXY

labs/osbash/scripts/centos/yum_update.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -o errexit -o nounset
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/openstack"
 source "$LIB_DIR/functions.guest.sh"

labs/osbash/scripts/config_private_network.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -o errexit -o nounset
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"
 source "$LIB_DIR/functions.guest.sh"

labs/osbash/scripts/config_public_network.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -o errexit -o nounset
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"
 source "$LIB_DIR/functions.guest.sh"

labs/osbash/scripts/etc_hosts.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -o errexit -o nounset
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$LIB_DIR/functions.guest.sh"
 

labs/osbash/scripts/osbash/activate_autostart.sh

@@ -9,7 +9,7 @@ readonly RCAUTOSTART=osbashauto
 # Remove any sysvinit files that called us (written by {ks,preseed}.cfg)
 rm -f /etc/init.d/osbash /etc/rc2.d/S40osbash
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 source "$TOP_DIR/config/paths"
 # source_deploy doesn't work here
 source "$CONFIG_DIR/deploy.osbash"

labs/osbash/scripts/osbash/base_fixups.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -o errexit -o nounset
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$LIB_DIR/functions.guest.sh"
 

labs/osbash/scripts/osbash/copy_openrc.sh

@@ -4,7 +4,7 @@ set -o errexit -o nounset
 # This script copies the openrc.sh credentials files to the home directory
 # in order to make them easier to find for the user.
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$LIB_DIR/functions.guest.sh"
 source "$CONFIG_DIR/openstack"

labs/osbash/scripts/osbash/enable_osbash_ssh_keys.sh

@@ -4,7 +4,7 @@ set -o errexit -o nounset
 # This script installs the insecure osbash ssh keys. This allows users to
 # log into the VMs using these keys instead of a password.
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$LIB_DIR/functions.guest.sh"
 

labs/osbash/scripts/osbash/init_xxx_node.sh

@@ -4,7 +4,7 @@ set -o errexit -o nounset
 # This scripts configures hostname and networking for all nodes. The filename
 # determines the node name.
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"
 source "$LIB_DIR/functions.guest.sh"

labs/osbash/scripts/osbash/wait_debug.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -o errexit -o nounset
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$LIB_DIR/functions.guest.sh"
 

labs/osbash/scripts/pre-download.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/openstack"

labs/osbash/scripts/pxe_server/install_pxeserver.sh

@@ -3,7 +3,7 @@
 # This script executes on the pxeserver and installs the PXE services
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/shutdown.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -o errexit -o nounset
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$LIB_DIR/functions.guest.sh"
 

labs/osbash/scripts/test/get_auth_token.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -o errexit -o nounset
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"
 source "$CONFIG_DIR/openstack"

labs/osbash/scripts/test/heat_stack.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/test/launch_instance_private_net.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -o errexit -o nounset
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"
 source "$LIB_DIR/functions.guest.sh"

labs/osbash/scripts/test/test_horizon.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -o errexit -o nounset
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"
 source "$CONFIG_DIR/config.controller"

labs/osbash/scripts/ubuntu/apt_init.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/openstack"

labs/osbash/scripts/ubuntu/apt_install_mysql.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/ubuntu/apt_nosql_database.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/ubuntu/apt_pre-download.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/openstack"

labs/osbash/scripts/ubuntu/apt_upgrade.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/openstack"

labs/osbash/scripts/ubuntu/create_xxx_node_pxeboot.sh

@@ -3,7 +3,7 @@
 # This scripts executes on the pxeserver and configures the service
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/ubuntu/install_memcached.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/ubuntu/install_rabbitmq.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/ubuntu/setup_cinder_controller.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/ubuntu/setup_cinder_volumes.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/ubuntu/setup_glance.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/ubuntu/setup_heat_controller.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/ubuntu/setup_horizon.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$LIB_DIR/functions.guest.sh"

labs/osbash/scripts/ubuntu/setup_keystone.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/ubuntu/setup_lbaas_controller.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/ubuntu/setup_lbaas_network.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/ubuntu/setup_neutron_compute.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/ubuntu/setup_neutron_compute_part_2.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/ubuntu/setup_neutron_controller.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/ubuntu/setup_neutron_controller_part_2.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/ubuntu/setup_nova_compute.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/ubuntu/setup_nova_controller.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/ubuntu/setup_self-service_compute.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/ubuntu/setup_self-service_controller.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/ubuntu/setup_telemetry_compute.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/ubuntu/setup_telemetry_controller.sh

@@ -2,7 +2,7 @@
 
 set -o errexit -o nounset
 
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/osbash/scripts/zero_empty.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -o errexit -o nounset
-TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
+TOP_DIR=$(cd $(cat "../TOP_DIR"||echo $(dirname "$0"))/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$LIB_DIR/functions.guest.sh"