From a2f777c19494999c5bec3ee50b63a627155d5d9b Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 23 Oct 2014 16:21:13 +0200 Subject: controller/dtf-run-remote: fix problems with default OS ID Rename the config vairable from DTF_OPENSTACK_ID to DTF_OPENSTACK_DEFAULT_ID to better match the name with its purpose. * controller/bin/dtf-run-remote.in: Use DTF_OPENSTACK_DEFAULT_ID instead of DTF_OPENSTACK_ID. * controller/config/config.sh.template: Moved. * controller/etc/dtf.conf.d/config.sh.template: Document renamed variable on new place. --- controller/bin/dtf-run-remote.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'controller/bin') diff --git a/controller/bin/dtf-run-remote.in b/controller/bin/dtf-run-remote.in index 276ad40..d801d28 100644 --- a/controller/bin/dtf-run-remote.in +++ b/controller/bin/dtf-run-remote.in @@ -8,7 +8,7 @@ run_playbook=${run_playbook-@ansibleplaybooksdir@/fedora.yml} opt_workdir= opt_distro=fedora -opt_openstack_instance="$DTF_OPENSTACK_ID" +opt_openstack_instance="$DTF_OPENSTACK_DEFAULT_ID" opt_distro_ver=20 opt_extra_rpms= opt_taskdir= @@ -62,10 +62,11 @@ while true; do esac done +test -z "$opt_openstack_instance" && die "option --openstack-instance=ID not used" test -z "$opt_taskdir" && die "you must specify --taskdir" credsfile="$HOME/.dtf/private/os/$opt_openstack_instance.yml" -test ! -f "$credsfile" && die "file '$credsfile' not found" +test ! -f "$credsfile" && die "creds file '$credsfile' not found" config_os_file="$HOME/.dtf/os/$opt_openstack_instance.sh" test ! -r "$config_os_file" && die "file '$config_os_file' not found" -- cgit