From 473afcc755afb64e402708c833060fb65e7b4207 Mon Sep 17 00:00:00 2001
From: John Trowbridge <trown@redhat.com>
Date: Thu, 19 Oct 2017 16:52:59 -0400
Subject: [PATCH] Use playbook from tripleo-quickstart-extras for OVB

This is the final step to cut over to the combined
playbook in tripleo-quickstart-extras, so that we can
use a common playbook whether there is a testenv broker
involved or not.

Change-Id: I3ed261e3660426e62ed608bc1bc7923f3912a508
---
 toci-quickstart/config/testenv/ovb.yml | 6 ++++++
 toci_gate_test-oooq.sh                 | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/toci-quickstart/config/testenv/ovb.yml b/toci-quickstart/config/testenv/ovb.yml
index c912c2cf0..da745bb81 100644
--- a/toci-quickstart/config/testenv/ovb.yml
+++ b/toci-quickstart/config/testenv/ovb.yml
@@ -1,6 +1,10 @@
+undercloud_type: ovb
+use_testenv_broker: true
+build_test_packages: true
 undercloud_user: "{{ lookup('env','USER') }}"
 non_root_user: "{{ undercloud_user }}"
 ssh_user: "{{ undercloud_user }}"
+existing_key_location: "/etc/nodepool/id_rsa"
 enable_vbmc: false
 gating_repo_enabled: true
 
@@ -14,6 +18,8 @@ non_root_user_setup: false
 step_set_undercloud_hostname: true
 undercloud_hostname: undercloud
 undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_PROXY') }}"
+run_validate_undercloud: true
+step_overcloud_prep_flavors: false
 
 skip_pingtest_cleanup: true
 # Overcloud deploy
diff --git a/toci_gate_test-oooq.sh b/toci_gate_test-oooq.sh
index 24a29afbf..06ce33efe 100755
--- a/toci_gate_test-oooq.sh
+++ b/toci_gate_test-oooq.sh
@@ -138,7 +138,7 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
             OVB=1
             ENVIRONMENT="ovb"
             UCINSTANCEID=$(http_proxy= curl http://169.254.169.254/openstack/2015-10-15/meta_data.json | python -c 'import json, sys; print json.load(sys.stdin)["uuid"]')
-            PLAYBOOK="ovb.yml"
+            PLAYBOOK="baremetal-full-deploy.yml"
             ENV_VARS="$ENV_VARS --environment $TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/ovb.yml"
             if [[ -f  "$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/ovb-$RHCLOUD.yml" ]]; then
                 ENV_VARS="$ENV_VARS --extra-vars @$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/ovb-$RHCLOUD.yml"