From 6746c0c9489f60b91ef0137d600407dab7a054ea Mon Sep 17 00:00:00 2001
From: agopi <agopi@redhat.com>
Date: Wed, 7 Nov 2018 14:30:38 -0500
Subject: [PATCH] Adding extra-vars needed for deployment of queens/rocky

1. Added containerized_overcloud for queens
2. Set containerized_overcloud and undercloud for rocky
3. Set ntp server to clock.corp.redhat.com for rocky as
   rocky builds fail on uc deployment while NTP syncing.

Change-Id: I77434b104ab48eec097b28da92cc7fe93f6cfc79
---
 ci-scripts/tripleo/microbrow-browbeat-ci.sh |  5 +++++
 ci-scripts/tripleo/microbrow-perfci.sh      | 14 ++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/ci-scripts/tripleo/microbrow-browbeat-ci.sh b/ci-scripts/tripleo/microbrow-browbeat-ci.sh
index a07ef0458..b6292132e 100755
--- a/ci-scripts/tripleo/microbrow-browbeat-ci.sh
+++ b/ci-scripts/tripleo/microbrow-browbeat-ci.sh
@@ -57,6 +57,11 @@ if [ ! -z ${current_build+x} ]
   fi
 fi
 
+# For queens onwards we need a containerized_overcloud
+if [[ $RELEASE == "queens" ]]
+ then
+  export VARS="$VARS --extra-vars containerized_overcloud=true"
+fi
 
 #used to ensure concurrent jobs on the same executor work
 socketdir=$(mktemp -d /tmp/sockXXXXXX)
diff --git a/ci-scripts/tripleo/microbrow-perfci.sh b/ci-scripts/tripleo/microbrow-perfci.sh
index 9c2ef7ae3..0aa12ff9d 100755
--- a/ci-scripts/tripleo/microbrow-perfci.sh
+++ b/ci-scripts/tripleo/microbrow-perfci.sh
@@ -60,6 +60,20 @@ if [ ! -z ${current_build+x} ]
   fi
 fi
 
+# For queens onwards we need a containerized_overcloud
+if [[ $RELEASE == "queens" ]]
+ then
+  export VARS="$VARS --extra-vars containerized_overcloud=true"
+fi
+
+# For rocky we need a containerized_overcloud and undercloud
+if [[ $RELEASE == "rocky" ]]
+ then
+  export VARS="$VARS --extra-vars containerized_overcloud=true \
+  --extra-vars containerized_undercloud=true \
+  --extra-vars undercloud_ntp_servers=clock.corp.redhat.com"
+fi
+
 #Adding extra vars to deploy cloud with ovn
 #if the job is an ovn job
 if [[ $TOOL == ovn ]]