From: Tim Rozet <trozet@redhat.com>
Date: Tue, 2 Feb 2016 04:51:04 +0000 (+0000)
Subject: Merge "fix 'unary operator expected' in conditional expression"
X-Git-Tag: colorado.1.0~302
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=639c2b95061ed5a9d2ab38ac3a9fb276bc812f0a;p=apex.git

Merge "fix 'unary operator expected' in conditional expression"
---

639c2b95061ed5a9d2ab38ac3a9fb276bc812f0a
diff --cc ci/deploy.sh
index 55ba5b6a,3ce14c2a..3143aae9
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@@ -788,21 -788,20 +788,21 @@@ function undercloud_prep_overcloud_depl
        DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight.yaml"
      fi
      SDN_IMAGE=opendaylight
-     if [ ${deploy_options_array['sfc']} == 'true' ]; then
+     if [ "${deploy_options_array['sfc']}" == 'true' ]; then
        SDN_IMAGE+=-sfc
      fi
-   elif [ ${deploy_options_array['sdn_controller']} == 'opendaylight-external' ]; then
+   elif [ "${deploy_options_array['sdn_controller']}" == 'opendaylight-external' ]; then
      DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight-external.yaml"
      SDN_IMAGE=opendaylight
-   elif [ ${deploy_options_array['sdn_controller']} == 'onos' ]; then
+   elif [ "${deploy_options_array['sdn_controller']}" == 'onos' ]; then
      DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/onos.yaml"
      SDN_IMAGE=opendaylight
-   elif [ ${deploy_options_array['sdn_controller']} == 'opencontrail' ]; then
+   elif [ "${deploy_options_array['sdn_controller']}" == 'opencontrail' ]; then
      echo -e "${red}ERROR: OpenContrail is currently unsupported...exiting${reset}"
      exit 1
-   elif [[ -z ${deploy_options_array['sdn_controller']} || ${deploy_options_array['sdn_controller']} == 'false' ]]; then
+   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}"