From: Stefan Berg <stefan.k.berg@ericsson.com>
Date: Fri, 29 Jan 2016 13:30:28 +0000 (+0000)
Subject: Merge "Sync with recent changes in fuel-main" into stable/brahmaputra
X-Git-Tag: brahmaputra.1.rc1~43
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f32ce90a3a08891ab2253ca910b7025314b0c8d8;p=fuel.git

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

f32ce90a3a08891ab2253ca910b7025314b0c8d8
diff --cc build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh
index 85a35043f,b01f0b7a6..35d107ab4
--- a/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