Merge "Sync with recent changes in fuel-main" into stable/brahmaputra

diff --cc build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh
index 85a3504,b01f0b7..35d107a
--- 1/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh
--- 2/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh
+++ b/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh
@@@ -65,13 -112,18 +116,25 @@@ if [[ "$showmenu" == "yes" || "$showmen
    fi
  fi
  
 +systemctl reload sshd
 +
 +# Enable iptables
 +systemctl enable iptables.service
 +systemctl start iptables.service
 +
 +
+ if [ ! -f "${ASTUTE_YAML}" ]; then
+   echo ${fuelmenu_fail_message}
+   fail
+ fi
+ 
+ systemctl reload sshd
+ 
+ # Enable iptables
+ systemctl enable iptables.service
+ systemctl start iptables.service
+ 
+ 
  if [ "$wait_for_external_config" == "yes" ]; then
    wait_timeout=3000
    pidfile=/var/lock/wait_for_external_config

diff --cc build/f_isoroot/f_odlpluginbuild/Makefile
Simple merge