1 From: Fuel OPNFV <fuel@opnfv.org>
2 Date: Mon, 13 Jun 2016 22:23:57 +0200
3 Subject: [PATCH] OPNFV: Additions to bootstrap_admin_node.sh
6 iso/bootstrap_admin_node.sh | 39 +++++++++++++++++++++++++++++++--------
7 1 file changed, 31 insertions(+), 8 deletions(-)
9 diff --git a/iso/bootstrap_admin_node.sh b/iso/bootstrap_admin_node.sh
10 index 3197c91..db3123d 100755
11 --- a/iso/bootstrap_admin_node.sh
12 +++ b/iso/bootstrap_admin_node.sh
13 @@ -339,8 +339,22 @@ fuelmenu --save-only --iface=$ADMIN_INTERFACE || fail
17 +### OPNFV addition BEGIN
19 +for script in /opt/opnfv/bootstrap/pre.d/*.sh
21 + echo "Pre script: $script" >> /root/pre.log 2>&1
22 + $script >> /root/pre.log 2>&1
25 +### OPNFV addition END
28 +systemctl enable sshd
31 if [[ "$showmenu" == "yes" || "$showmenu" == "YES" ]]; then
35 # Give user 15 seconds to enter fuelmenu or else continue
37 @@ -360,9 +374,10 @@ else
41 +# OPNFV: Disabled to speedup installation in offline env.
42 # Enable online base MOS repos (security, updates) if we run an ISO installation
43 -[ -f /etc/fuel_build_id ] && \
44 - yum-config-manager --enable mos${FUEL_RELEASE}-security mos${FUEL_RELEASE}-updates --save
45 +#[ -f /etc/fuel_build_id ] && \
46 +# yum-config-manager --enable mos${FUEL_RELEASE}-security mos${FUEL_RELEASE}-updates --save
48 if [ ! -f "${ASTUTE_YAML}" ]; then
49 echo ${fuelmenu_fail_message}
50 @@ -377,9 +392,7 @@ if [ ! -f /etc/fuel_build_id ]; then
51 ln -s ${wwwdir}/${OPENSTACK_VERSION}/ubuntu ${wwwdir}/ubuntu
55 -systemctl enable sshd
57 +systemctl reload sshd
60 systemctl enable iptables.service
61 @@ -532,6 +545,16 @@ systemctl start ntpd
65 +### OPNFV addition BEGIN
67 +for script in /opt/opnfv/bootstrap/post.d/*.sh
69 + echo "Post script: $script" >> /root/post.log 2>&1
70 + $script >> /root/post.log 2>&1
73 +### OPNFV addition END
75 if [ "`get_bootstrap_skip`" = "False" ]; then
76 build_ubuntu_bootstrap bs_status || true
78 @@ -540,8 +563,8 @@ else
81 #Check if repo is accessible
82 -echo "Checking for access to updates repository..."
83 -repourl=$(yum repolist all -v | awk '{if ($1 ~ "baseurl" && $3 ~ "updates") print $3}' | head -1)
84 +echo "Checking for access to updates repository/mirrorlist..."
85 +repourl=$(yum repolist all -v | awk '{if ($1 ~ "baseurl|mirrors" && $3 ~ "updates") print $3}' | head -1)
86 if urlaccesscheck check "$repourl" ; then