diff options
| -rwxr-xr-x | ci/deploy.sh | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index b99a5693..bb4c1f81 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -502,7 +502,7 @@ function setup_virtual_baremetal { EOF # next create the virtual machines and add their definitions to the file - if [ ha_enabled != "FALSE" && "$ha_enabled" != "false" ]; then + if [ ha_enabled == "False" ]; then # 1 controller + computes # zero based so just pass compute count vm_index=$VM_COMPUTES @@ -651,7 +651,7 @@ function configure_network_environment { fi # check for ODL L3 - if [ "${deploy_options_array['sdn_l3']}" == 'true' ]; then + if [ "${deploy_options_array['sdn_l3']}" == 'True' ]; then ext_net_type=br-ex fi @@ -789,15 +789,15 @@ function undercloud_prep_overcloud_deploy { if [[ "${#deploy_options_array[@]}" -eq 0 || "${deploy_options_array['sdn_controller']}" == 'opendaylight' ]]; then if [ "${deploy_options_array['sdn_l3']}" == 'true' ]; then DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_l3.yaml" - elif [ "${deploy_options_array['sfc']}" == 'true' ]; then + elif [ "${deploy_options_array['sfc']}" == 'True' ]; then DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sfc.yaml" - elif [ "${deploy_options_array['vpn']}" == 'true' ]; then + elif [ "${deploy_options_array['vpn']}" == 'True' ]; then DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sdnvpn.yaml" else 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 if [ ! -f $RESOURCES/overcloud-full-${SDN_IMAGE}.qcow2 ]; then echo "${red} $RESOURCES/overcloud-full-${SDN_IMAGE}.qcow2 is required to execute an SFC deployment." @@ -1011,7 +1011,7 @@ EOI fi # for sfc deployments we need the vxlan workaround - if [ "${deploy_options_array['sfc']}" == 'true' ]; then + if [ "${deploy_options_array['sfc']}" == 'True' ]; then ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI source stackrc set -o errexit @@ -1065,7 +1065,6 @@ display_usage() { echo -e " -n|--net-settings : Full path to network settings file. Optional." echo -e " -p|--ping-site : site to use to verify IP connectivity. Optional. Defaults to 8.8.8.8" echo -e " -v|--virtual : Virtualize overcloud nodes instead of using baremetal." - echo -e " --no-ha : disable High Availability deployment scheme, this assumes a single controller and single compute node" echo -e " --flat : disable Network Isolation and use a single flat network for the underlay network." echo -e " --no-post-config : disable Post Install configuration." echo -e " --debug : enable debug output." @@ -1113,11 +1112,6 @@ parse_cmdline() { echo "Executing a Virtual Deployment" shift 1 ;; - --no-ha ) - ha_enabled="False" - echo "HA Deployment Disabled" - shift 1 - ;; --flat ) net_isolation_enabled="FALSE" echo "Underlay Network Isolation Disabled: using flat configuration" |