aboutsummaryrefslogtreecommitdiffstats
path: root/build/bootstrap_admin_node.sh.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-08-27 17:13:32 +0200
committerMichal Skalski <mskalski@mirantis.com>2016-09-17 20:20:53 +0000
commitf9326c161e2e8ed039499d30cced7c2553874e26 (patch)
tree1dd33d9050fda14d91c0a23c4e00a7becd76dbb3 /build/bootstrap_admin_node.sh.patch
parent269773ffd3bbd267aeee21b49f83783c064c04c6 (diff)
build: Move patches to <patch-repos> dir
Decouple main Makefile and repository patches by moving all Fuel component patches to a subdir, <patch-repo>. Proposed structure of <patch-repos> dir: - patch-repos/*.patch are intended for <fuel-main> git repo; - patch-repos/build/repo/<fuel-module>/*.patch are intended for <fuel-module>, e.g. "fuel-nailgun"; Full list of Fuel submodules supported by this mechanism at [1]. While at it, replace all occurences of </tmp/fuel-main> with <FUEL_MAIN_DIR> in main Makefile and rewrite a few git/make calls to use the "-C" arg. NOTE: `git -C` is available starting with git 1.8.5. [1] https://github.com/openstack/fuel-main/blob/stable/mitaka/repos.mk #L32-L44 Change-Id: I5e4adc7285054777c3898592ed48482ccd2b706f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 52701ce099ac455aa393aac34d684f5d59b3d2fe)
Diffstat (limited to 'build/bootstrap_admin_node.sh.patch')
-rw-r--r--build/bootstrap_admin_node.sh.patch83
1 files changed, 0 insertions, 83 deletions
diff --git a/build/bootstrap_admin_node.sh.patch b/build/bootstrap_admin_node.sh.patch
deleted file mode 100644
index d3769adfb..000000000
--- a/build/bootstrap_admin_node.sh.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From: Fuel OPNFV <fuel@opnfv.org>
-Date: Mon, 13 Jun 2016 22:23:57 +0200
-Subject: OPNFV: Additions to bootstrap_admin_node.sh
-
----
-diff --git a/iso/bootstrap_admin_node.sh b/iso/bootstrap_admin_node.sh
-index 3197c91..e035145 100755
---- a/iso/bootstrap_admin_node.sh
-+++ b/iso/bootstrap_admin_node.sh
-@@ -339,8 +339,22 @@ 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
-+### OPNFV addition END
-+
-+# Enable sshd
-+systemctl enable sshd
-+systemctl start sshd
-+
- if [[ "$showmenu" == "yes" || "$showmenu" == "YES" ]]; then
-- fuelmenu || fail
-+ fuelmenu
- else
- # Give user 15 seconds to enter fuelmenu or else continue
- echo
-@@ -360,9 +374,10 @@ else
- 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
-+#[ -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}
-@@ -377,7 +392,5 @@ if [ ! -f /etc/fuel_build_id ]; then
-
--# Enable sshd
--systemctl enable sshd
--systemctl start sshd
-+systemctl reload sshd
-
- # Enable iptables
- systemctl enable iptables.service
-@@ -532,6 +545,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
-@@ -571,8 +571,8 @@
- fi
-
- #Check if repo is accessible
--echo "Checking for access to updates repository..."
--repourl=$(yum repolist all -v | awk '{if ($1 ~ "baseurl" && $3 ~ "updates") print $3}' | head -1)
-+echo "Checking for access to updates repository/mirrorlist..."
-+repourl=$(yum repolist all -v | awk '{if ($1 ~ "baseurl|mirrors" && $3 ~ "updates") print $3}' | head -1)
- if urlaccesscheck check "$repourl" ; then
- UPDATE_ISSUES=0
- else