controller/dtf-run-remote: start VM via dtf-get-machine

.. rather than by ansible nova_compute module directly.  Allows me
implement more variability in VM handling.

* controller/bin/dtf-get-machine.in: Add --quiet option which
causes that only allocated IP is shown.  Add also
DTF_GET_MACHINE_FAKE_IP variable usable for faster debugging; when
set, dtf-get-machine prints its content to standard output without
allocating new VM.
* controller/bin/dtf-run-remote.in: Add -v (verbose) option to
ansible-playbook call to get more verbose output.
* controller/share/dtf-controller/ansible/playbooks/fedora.yml:
Use dtf-get-machine.  Also remove creds file requirement.

3 files changed, 24 insertions, 22 deletions

diff --git a/controller/bin/dtf-get-machine.in b/controller/bin/dtf-get-machine.in
index 57e9fa4..6f9873c 100644
--- a/controller/bin/dtf-get-machine.in
+++ b/controller/bin/dtf-get-machine.in
@@ -2,8 +2,13 @@
 
 . "@sysconfdir@/dtf.sh" || exit 1
 
+opt_quiet=0
+
 die() { echo "$@" ; exit 1 ; }
-info() { echo " * $@" ; }
+info()
+{
+    test "$opt_quiet" -eq 0 && echo " * $@"
+}
 
 opt_openstack_instance="$DTF_OPENSTACK_DEFAULT_ID"
 opt_distro=fedora
@@ -45,7 +50,7 @@ get_ip()
 )
 
 
-longopts="distro:,distro-version:,openstack-instance:,name:"
+longopts="distro:,distro-version:,openstack-instance:,name:,quiet"
 ARGS=$(getopt -o "" -l "help,$longopts" -n "$0" -- "$@") \
     || exit 1
 eval set -- "$ARGS"
@@ -58,6 +63,12 @@ while true; do
         shift 2
         ;;
 
+    --quiet)
+        opt=$(sed -e 's/^--//' -e 's/[^[a-zA-Z0-9]/_/g'<<<"$1")
+        eval "opt_$opt=1"
+        shift
+        ;;
+
     --help)
         show_help 0
         ;;
@@ -68,6 +79,11 @@ while true; do
     esac
 done
 
+if test -n "$DTF_GET_MACHINE_FAKE_IP"; then
+    echo "$DTF_GET_MACHINE_FAKE_IP"
+    exit 0
+fi
+
 test -z "$opt_openstack_instance" && die "no openstack intance ID used"
 
 . "@pkgdatadir@/parse_credsfile" "$opt_openstack_instance" || exit 1
@@ -87,5 +103,4 @@ machine=$(boot "$opt_name" "$image" "$flavor")
 
 info "machine id: $machine"
 
-ip=$(get_ip "$machine")
-info "ip: $ip"
+get_ip "$machine"
diff --git a/controller/bin/dtf-run-remote.in b/controller/bin/dtf-run-remote.in
index d801d28..229097f 100644
--- a/controller/bin/dtf-run-remote.in
+++ b/controller/bin/dtf-run-remote.in
@@ -97,7 +97,7 @@ workdir_prereq
 testsuite_name="$(tarball)" || die "can not create dist tarball"
 
 export ANSIBLE_HOST_KEY_CHECKING=False
-ansible-playbook "$run_playbook" \
+ansible-playbook -v "$run_playbook" \
     --extra-vars "opt_generated_vars=@ansiblevarsdir@/generated-vars.yml" \
     --extra-vars "opt_distro=$opt_distro" \
     --extra-vars "opt_distro_ver=$opt_distro_ver" \
diff --git a/controller/share/dtf-controller/ansible/playbooks/fedora.yml b/controller/share/dtf-controller/ansible/playbooks/fedora.yml
index 215e048..7c62f61 100644
--- a/controller/share/dtf-controller/ansible/playbooks/fedora.yml
+++ b/controller/share/dtf-controller/ansible/playbooks/fedora.yml
@@ -3,7 +3,6 @@
   gather_facts: False
   hosts: localhost
   vars_files:
-  - "{{ opt_credsfile }}"
   - "{{ opt_generated_vars }}"
 
   tasks:
@@ -11,23 +10,12 @@
     local_action: shell echo `dd if=/dev/urandom bs=1k count=10 | md5sum ; echo DBTESTS`
     register: vm_name
 
-  - debug: msg="osusername={{ os_username }}"
-
-  - name: spin it up
-    local_action: nova_compute auth_url={{os_auth_url}}
-        flavor_id={{os_flavor_id}} image_id="{{ os_image_id }}" key_name={{ os_keypair }}
-        login_password={{os_nova_password}} login_tenant_name="{{os_tenant_name}}"
-        login_username={{os_username}} security_groups={{os_security_group}}
-        wait=yes name="{{vm_name.stdout}}" wait_for=600
-    register: nova
-
-  - debug: msg="{{ nova.info.addresses }}"
-
-    # This is ugly as hell...  Hopefully nothing will be changing.
-  - local_action: command echo "{{ nova.info.addresses[os_network_dev][1].addr }}"
+  - local_action: shell {{ config_bindir }}/dtf-get-machine
+        --distro {{ opt_distro }} --distro-version {{ opt_distro_ver }}
+        --quiet --name "{{ vm_name.stdout }}"
     register: machine_ip
 
-  - debug: msg="{{ machine_ip.stdout }}"
+  - debug: var=machine_ip
 
   - name: wait for the host to be hot
     local_action: wait_for host={{ machine_ip.stdout }} port=22 delay=5 timeout=600
@@ -42,7 +30,6 @@
   user: root
   gather_facts: False
   vars_files:
-  - "{{ opt_credsfile }}"
   - "{{ opt_generated_vars }}"
   tasks:
   - copy: src={{ opt_workdir }}/{{ opt_testsuite_name }}.tar.gz