diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-06-02 17:46:16 -0500 |
|---|---|---|
| committer | Trey Morris <trey.morris@rackspace.com> | 2011-06-02 17:46:16 -0500 |
| commit | b6af3d070a7767182df09e6f3e739675e6dbea89 (patch) | |
| tree | b88e87226a1b9703b54cd90f19b70ed32b87eaa9 /nova/auth | |
| parent | eee29c8142e530c801d655cf27858297946010ec (diff) | |
| parent | f3e3b4b0fb1fb948f0fa5042ab854c00a710a6c2 (diff) | |
| download | nova-b6af3d070a7767182df09e6f3e739675e6dbea89.tar.gz nova-b6af3d070a7767182df09e6f3e739675e6dbea89.tar.xz nova-b6af3d070a7767182df09e6f3e739675e6dbea89.zip | |
merge trunk... yay...
Diffstat (limited to 'nova/auth')
| -rw-r--r-- | nova/auth/novarc.template | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/auth/novarc.template b/nova/auth/novarc.template index cda2ecc28..eba3a8537 100644 --- a/nova/auth/novarc.template +++ b/nova/auth/novarc.template @@ -1,4 +1,6 @@ -NOVA_KEY_DIR=$(pushd $(dirname $BASH_SOURCE)>/dev/null; pwd; popd>/dev/null) +NOVARC=$(readlink -f "${BASH_SOURCE:-${0}}" 2>/dev/null) || + NOVARC=$(python -c 'import os,sys; print os.path.abspath(os.path.realpath(sys.argv[1]))' "${BASH_SOURCE:-${0}}") +NOVA_KEY_DIR=${NOVARC%%/*} export EC2_ACCESS_KEY="%(access)s:%(project)s" export EC2_SECRET_KEY="%(secret)s" export EC2_URL="%(ec2)s" |