Fixes missing image for nosdn deployments 07/8907/1
authorTim Rozet <trozet@redhat.com>
Sat, 30 Jan 2016 22:57:21 +0000 (17:57 -0500)
committerTim Rozet <trozet@redhat.com>
Mon, 1 Feb 2016 15:14:48 +0000 (15:14 +0000)
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)

ci/deploy.sh

index 5cccb06..55ba5b6 100755 (executable)
@@ -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}"