controller/dtf-get-machine: use actual configuration

* controller/bin/dtf-get-machine.in: Use $HOME/.dtf/.. rather than
$srcdir/config/...

1 files changed, 6 insertions, 2 deletions

diff --git a/controller/bin/dtf-get-machine.in b/controller/bin/dtf-get-machine.in
index 0d7c567..57e9fa4 100644
--- a/controller/bin/dtf-get-machine.in
+++ b/controller/bin/dtf-get-machine.in
@@ -1,9 +1,11 @@
 #!/bin/bash
 
+. "@sysconfdir@/dtf.sh" || exit 1
+
 die() { echo "$@" ; exit 1 ; }
 info() { echo " * $@" ; }
 
-opt_openstack_instance=os1
+opt_openstack_instance="$DTF_OPENSTACK_DEFAULT_ID"
 opt_distro=fedora
 opt_distro_version=20
 
@@ -66,8 +68,10 @@ while true; do
     esac
 done
 
+test -z "$opt_openstack_instance" && die "no openstack intance ID used"
+
 . "@pkgdatadir@/parse_credsfile" "$opt_openstack_instance" || exit 1
-. ./config/os/"$opt_openstack_instance.sh" || exit 1
+. "$HOME/.dtf/os/$opt_openstack_instance.sh" || exit 1
 
 image_version=$opt_distro$opt_distro_version
 image=${os_image_ids[$image_version]}