From: Tim Rozet <trozet@redhat.com>
Date: Sat, 30 Jan 2016 22:57:21 +0000 (-0500)
Subject: Fixes missing image for nosdn deployments
X-Git-Tag: brahmaputra.1.0~26
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c33a1ff1526172fec7afe04470d102e9abf81c85;p=apex.git

Fixes missing image for nosdn deployments

Note this image could change from opendaylight to a regular overcloud
image if we choose to split out a nosdn rpm in the future.  For now
fallback to the ODL image.

JIRA: APEX-78

Change-Id: I959d917330b1d8f68c16c3d122901494112db071
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit 910f7c156549c14d3e635eab2707c87790116439)
---

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 5cccb06b..55ba5b6a 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -802,6 +802,7 @@ function undercloud_prep_overcloud_deploy {
     exit 1
   elif [[ -z ${deploy_options_array['sdn_controller']} || ${deploy_options_array['sdn_controller']} == 'false' ]]; then
     echo -e "${blue}INFO: SDN Controller disabled...will deploy nosdn scenario${reset}"
+    SDN_IMAGE=opendaylight
   else
     echo "${red}Invalid sdn_controller: ${deploy_options_array['sdn_controller']}${reset}"
     echo "${red}Valid choices are opendaylight, opendaylight-external, onos, opencontrail, false, or null${reset}"