diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-10-12 16:42:35 +0200 |
|---|---|---|
| committer | Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-11-15 15:35:15 +0100 |
| commit | 9f8aff6636e0d86834178b461802f3e7cb95189d (patch) | |
| tree | 3bbfec85cda9774295b5f30f8417ee36e512368d /build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch | |
| parent | 38579142c683dbf26a6560d53d900111f4df4f6b (diff) | |
Uplift to Fuel 10.0/Newton
Build working, automated deploy working (simple test cases only).
All plugins disabled, so is the generation of the local ISO cache.
Both need to be re-enabled after merge of this uplift.
All patches wiped, pertinent ones need to be re-enabled after the
merge of this uplift.
Change-Id: I978a3d4ed25a45a4b88a6e35693baac597b162c2
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Diffstat (limited to 'build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch')
| -rw-r--r-- | build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch b/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch new file mode 100644 index 000000000..820e387d0 --- /dev/null +++ b/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch @@ -0,0 +1,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..1826390 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 reload 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 |