From a16c6a66d48eeb13d6976082ef34d89015733364 Mon Sep 17 00:00:00 2001
From: Ronelle Landy <rlandy@redhat.com>
Date: Wed, 18 Jul 2018 09:35:37 -0400
Subject: [PATCH] Add Browbeat env settings to rdocloud

Required for testing fs053 - where the cloud
and logging hosts have to be set.

Also add browbeat playbook to ovb playbooks list.
Only to be run conditionally.

Change-Id: Ice5de11d0c0ac0a808a0036f57a3f91b73a961bd
---
 toci-quickstart/config/collect-logs.yml         | 1 +
 toci-quickstart/config/testenv/ovb-rdocloud.yml | 5 +++++
 toci_gate_test.sh                               | 9 ++++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/toci-quickstart/config/collect-logs.yml b/toci-quickstart/config/collect-logs.yml
index 8d657f4e3..efb83930b 100644
--- a/toci-quickstart/config/collect-logs.yml
+++ b/toci-quickstart/config/collect-logs.yml
@@ -41,6 +41,7 @@ artcl_collect_list:
   - /home/{{ undercloud_user }}/tripleo-config/
   - /home/{{ undercloud_user }}/undercloud-ansible-*/
   - /home/{{ undercloud_user }}/undercloud-install-*
+  - /home/{{ undercloud_user }}/browbeat/log/*
   - /tmp/ansible-mistral-action*/
   - /etc/ansible/
   - /etc/aodh/
diff --git a/toci-quickstart/config/testenv/ovb-rdocloud.yml b/toci-quickstart/config/testenv/ovb-rdocloud.yml
index 4c05ad853..de4a98473 100644
--- a/toci-quickstart/config/testenv/ovb-rdocloud.yml
+++ b/toci-quickstart/config/testenv/ovb-rdocloud.yml
@@ -49,3 +49,8 @@ influxdb_password:
 influxdb_dbname: tripleo_ci
 influxdb_data_file_path: "{{ artcl_collect_dir }}/influxdb_data"
 influxdb_create_data_file: true
+
+# Browbeat settings
+cloud_name: rdocloud
+elastic_host: browbeat.test.com
+grafana_host: browbeat.test.com
diff --git a/toci_gate_test.sh b/toci_gate_test.sh
index aec4c467c..2c01c5e05 100755
--- a/toci_gate_test.sh
+++ b/toci_gate_test.sh
@@ -129,7 +129,7 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
             if [[ " $QUICKSTART_SH_JOBS " =~ " $TOCI_JOBTYPE " ]]; then
                 export PLAYBOOKS=${PLAYBOOKS:-"baremetal-full-deploy.yml"}
             else
-                export PLAYBOOKS=${PLAYBOOKS:-"ovb-setup.yml baremetal-full-undercloud.yml baremetal-full-overcloud-prep.yml baremetal-full-overcloud.yml baremetal-full-overcloud-validate.yml"}
+                export PLAYBOOKS=${PLAYBOOKS:-"ovb-setup.yml baremetal-full-undercloud.yml baremetal-full-overcloud-prep.yml baremetal-full-overcloud.yml baremetal-full-overcloud-validate.yml browbeat-minimal.yml"}
             fi
             ENV_VARS="$ENV_VARS --extra-vars @$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/ovb.yml"
             if [[ -f  "$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/ovb-$RHCLOUD.yml" ]]; then
@@ -231,6 +231,13 @@ else
     echo "git+https://git.openstack.org/openstack/tripleo-upgrade.git@${ZUUL_BRANCH}#egg=tripleo-upgrade" >> ${TRIPLEO_ROOT}/tripleo-quickstart/quickstart-extras-requirements.txt
 fi
 
+# Import gated external repo in oooq
+for EXTERNAL_REPO in 'browbeat'; do
+    if [[ -d $TRIPLEO_ROOT/$EXTERNAL_REPO ]]; then
+        sed -i "s#git+https://git.openstack.org/openstack/$EXTERNAL_REPO#file://${TRIPLEO_ROOT}/$EXTERNAL_REPO#1" ${TRIPLEO_ROOT}/tripleo-quickstart/quickstart-extras-requirements.txt
+    fi
+done
+
 # Start time tracking
 export STATS_TESTENV=$(date +%s)
 pushd $TRIPLEO_ROOT/tripleo-ci