diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-05-31 14:49:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-05-31 14:49:36 +0000 |
| commit | ec0c7698cd363b71694ca33e87f65fc382acda8d (patch) | |
| tree | 3472b6dbb13612ce59f00c8ef1630fd9c3ed25ed /build/bootstrap_admin_node.sh.patch | |
| parent | ebb5b355ba542fc22b8f96f952439251d4b2c90b (diff) | |
| parent | 6d672885e96f25309ef36da9a6b3c93968ec0c5e (diff) | |
Merge "Build system uplift to Fuel 9.0/Mitaka"
Diffstat (limited to 'build/bootstrap_admin_node.sh.patch')
| -rw-r--r-- | build/bootstrap_admin_node.sh.patch | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/build/bootstrap_admin_node.sh.patch b/build/bootstrap_admin_node.sh.patch new file mode 100644 index 000000000..aeef3f7b4 --- /dev/null +++ b/build/bootstrap_admin_node.sh.patch @@ -0,0 +1,73 @@ +*** 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 +*************** +*** 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 |