From 5407a693d363de5a1f523d7477a231fb395dd1ef Mon Sep 17 00:00:00 2001
From: Sergey Kulanov <skulanov@mirantis.com>
Date: Fri, 15 Apr 2016 12:53:50 +0300
Subject: [PATCH] Remove CentOS bootstrap code

CentOS bootstrap was removed, so we need to align
bootstrap_admin_node script as well

Change-Id: I23de9ef8763194cb6f644c49a5a8a171b34ff874
Related-bug: #1534178
---
 iso/bootstrap_admin_node.sh | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/iso/bootstrap_admin_node.sh b/iso/bootstrap_admin_node.sh
index 55def875f..53a327d30 100755
--- a/iso/bootstrap_admin_node.sh
+++ b/iso/bootstrap_admin_node.sh
@@ -92,9 +92,6 @@ reboot nodes that failed to be discovered."
 bs_done_message="Default bootstrap image building done. Now you can boot new \
 nodes over PXE, they will be discovered and become available for installing \
 OpenStack on them"
-bs_centos_message="WARNING: Deprecated Centos bootstrap has been chosen \
-and activated. Now you can boot new nodes over PXE, they will be discovered \
-and become available for installing OpenStack on them."
 # Update issues messages
 update_warn_message="There is an issue connecting to update repository of \
 your distributions of OpenStack. \
@@ -451,7 +448,7 @@ get_bootstrap_flavor () {
 	from yaml import safe_load
 	with open("$ASTUTE_YAML", 'r') as f:
 	    conf = safe_load(f).get('BOOTSTRAP', {})
-	print(conf.get('flavor', 'centos').lower())
+	print(conf.get('flavor', 'ubuntu').lower())
 	EOF
 }
 
@@ -527,16 +524,11 @@ systemctl start ntpd
 
 bash /etc/rc.local
 
-if [ "`get_bootstrap_flavor`" = "ubuntu" ]; then
-  if [ "`get_bootstrap_skip`" = "False" ]; then
-    build_ubuntu_bootstrap bs_status || true
-  else
-    fuel notify --topic "warning" --send "${bs_skip_message}"
-    bs_status=2
-  fi
+if [ "`get_bootstrap_skip`" = "False" ]; then
+  build_ubuntu_bootstrap bs_status || true
 else
-  fuel notify --topic "warning" --send "${bs_centos_message}"
-  bs_status=3
+  fuel notify --topic "warning" --send "${bs_skip_message}"
+  bs_status=2
 fi
 
 #Check if repo is accessible
@@ -571,10 +563,6 @@ case ${bs_status} in
   echo -e "${bs_skip_message}"
   echo "*************************************************"
   ;;
-  3)
-  echo -e "${bs_centos_message}"
-  echo "*************************************************"
-  ;;
 esac
 
 echo "Fuel node deployment complete!"