Merge "Fixing an incorrect variable name" into stable/brahmaputra

diff --combined ci/deploy.sh
index a7d803d,f80a88a..092f5c1
--- 1/ci/deploy.sh
--- 2/ci/deploy.sh
+++ b/ci/deploy.sh
@@@ -194,7 -194,7 +194,7 @@@ for Auto-detection${reset}
      done
      echo -e "${blue}INFO: Detecting Network Specific settings for: ${enabled_network}${reset}"
      # detect network specific settings
-     if [ -n $(eval echo \${${network}_optional_settings}) ]; then
+     if [ -n $(eval echo \${${enabled_network}_optional_settings}) ]; then
        eval "network_specific_settings=\${${enabled_network}_optional_settings}"
        for setting in ${network_specific_settings}; do
          eval "setting_value=\${${enabled_network}_${setting}}"
@@@ -986,34 -986,6 +986,34 @@@ EO
  done
  EOI
    fi
 +
 +  # Collect deployment logs
 +  ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
 +mkdir -p ~/deploy_logs
 +rm -rf deploy_logs/*
 +source stackrc
 +set -o errexit
 +for node in \$(nova list | grep -Eo "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+"); do
 + ssh -T ${SSH_OPTIONS[@]} "heat-admin@\$node" <<EOF
 + sudo cp /var/log/messages /home/heat-admin/messages.log
 + sudo chown heat-admin /home/heat-admin/messages.log
 +EOF
 +scp ${SSH_OPTIONS[@]} heat-admin@\$node:/home/heat-admin/messages.log ~/deploy_logs/\$node.messages.log
 +if [ \$debug == "TRUE" ]; then
 +    nova list --ip \$node
 +    echo "---------------------------"
 +    echo "-----/var/log/messages-----"
 +    echo "---------------------------"
 +    cat ~/deploy_logs/\$node.messages.log
 +    echo "---------------------------"
 +    echo "----------END LOG----------"
 +    echo "---------------------------"
 +fi
 + ssh -T ${SSH_OPTIONS[@]} "heat-admin@\$node" <<EOF
 + sudo rm -f /home/heat-admin/messages.log
 +EOF
 +done
 +EOI
  }
  
  display_usage() {