From 9bebfc4c3a614ca6f3721fbef4c466e74411323a Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Thu, 7 Apr 2016 11:52:01 -0400
Subject: Fixes controller Image to be overcloud-full

New param introduced into THT that exposes the image to use for the
Controller.  The new var is defaulted to use overcloud-control and is
causing master to fail.

Changes Include:
 - Adds opnfv-environment yaml file to use for common parameters
   required in all deployments
 - Defaults controllerImage to be overcloud-full

Change-Id: I5da8921d9c9efd167748a3d6f42866d18f46d2b7
Signed-off-by: Tim Rozet <trozet@redhat.com>
---
 ci/deploy.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ci/deploy.sh')

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 9e317c8a..c14a91e3 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -922,6 +922,8 @@ function undercloud_prep_overcloud_deploy {
      DEPLOY_OPTIONS+=" --control-flavor control --compute-flavor compute"
   fi
 
+  DEPLOY_OPTIONS+=" -e opnfv-environment.yaml"
+
   echo -e "${blue}INFO: Deploy options set:\n${DEPLOY_OPTIONS}${reset}"
 
   ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
-- 
cgit 1.2.3-korg