blob: bf0f331db37d32ab3a011559ccb37cbfab52688c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
From: "Stefan K. Berg" <sfb@consultron.com>
Date: Fri, 4 Nov 2016 16:06:42 +0100
Subject: [PATCH] Patches for OPNFV
---
iso/bootstrap_admin_node.sh | 30 +++++++++++++++++++++++++++---
1 file changed, 27 insertions(+), 3 deletions(-)
diff --git a/iso/bootstrap_admin_node.sh b/iso/bootstrap_admin_node.sh
index dbcac5f..472e418 100755
--- a/iso/bootstrap_admin_node.sh
+++ b/iso/bootstrap_admin_node.sh
@@ -347,8 +347,23 @@ fuelmenu --save-only --iface=$ADMIN_INTERFACE || fail
set +x
echo "Done!"
+### OPNFV addition BEGIN
+shopt -s nullglob
+for script in /opt/opnfv/bootstrap/pre.d/*.sh
+do
+ echo "Pre script: $script" >> /root/pre.log 2>&1
+ $script >> /root/pre.log 2>&1
+done
+shopt -u nullglob
+
+# Enable sshd
+systemctl enable sshd
+systemctl start sshd
+
+### OPNFV addition END
+
if [[ "$showmenu" == "yes" || "$showmenu" == "YES" ]]; then
- fuelmenu || fail
+ fuelmenu
else
# Give user 15 seconds to enter fuelmenu or else continue
echo
@@ -386,8 +401,7 @@ if [ ! -f /etc/fuel_build_id ]; then
fi
# Enable sshd
-systemctl enable sshd
-systemctl start sshd
+systemctl restart sshd
# Enable iptables
systemctl enable iptables.service
@@ -546,6 +560,16 @@ systemctl start ntpd
bash /etc/rc.local
+### OPNFV addition BEGIN
+shopt -s nullglob
+for script in /opt/opnfv/bootstrap/post.d/*.sh
+do
+ echo "Post script: $script" >> /root/post.log 2>&1
+ $script >> /root/post.log 2>&1
+done
+shopt -u nullglob
+### OPNFV addition END
+
if [ "`get_bootstrap_skip`" = "False" ]; then
build_ubuntu_bootstrap bs_status || true
else
|
