blob: e137b740d0fb2f229f2ca0ddd673401c6c7254a1 (
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
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
*** bootstrap_admin_node.sh.orig Mon May 30 06:31:38 2016
--- bootstrap_admin_node.sh Mon May 30 06:35:11 2016
***************
*** 339,346 ****
set +x
echo "Done!"
if [[ "$showmenu" == "yes" || "$showmenu" == "YES" ]]; then
! fuelmenu || fail
else
# Give user 15 seconds to enter fuelmenu or else continue
echo
--- 339,360 ----
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
+ ### OPNFV addition END
+
+ # Enable sshd
+ systemctl enable sshd
+ systemctl start sshd
+
if [[ "$showmenu" == "yes" || "$showmenu" == "YES" ]]; then
! fuelmenu
else
# Give user 15 seconds to enter fuelmenu or else continue
echo
***************
*** 360,368 ****
fi
fi
# Enable online base MOS repos (security, updates) if we run an ISO installation
! [ -f /etc/fuel_build_id ] && \
! yum-config-manager --enable mos${FUEL_RELEASE}-security mos${FUEL_RELEASE}-updates --save
if [ ! -f "${ASTUTE_YAML}" ]; then
echo ${fuelmenu_fail_message}
--- 360,369 ----
fi
fi
+ # OPNFV: Disabled to speedup installation in offline env.
# Enable online base MOS repos (security, updates) if we run an ISO installation
! #[ -f /etc/fuel_build_id ] && \
! # yum-config-manager --enable mos${FUEL_RELEASE}-security mos${FUEL_RELEASE}-updates --save
if [ ! -f "${ASTUTE_YAML}" ]; then
echo ${fuelmenu_fail_message}
***************
*** 374,382 ****
[ ! -f /etc/fuel_build_id ] && \
sed -i "s|127.0.0.1:8080/ubuntu/x86_64|mirror.fuel-infra.org/mos-repos/ubuntu/${FUEL_RELEASE}|g" "${ASTUTE_YAML}"
! # Enable sshd
! systemctl enable sshd
! systemctl start sshd
# Enable iptables
systemctl enable iptables.service
--- 388,394 ----
[ ! -f /etc/fuel_build_id ] && \
sed -i "s|127.0.0.1:8080/ubuntu/x86_64|mirror.fuel-infra.org/mos-repos/ubuntu/${FUEL_RELEASE}|g" "${ASTUTE_YAML}"
! systemctl reload sshd
# Enable iptables
systemctl enable iptables.service
***************
*** 529,534 ****
--- 541,556 ----
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
|
