summaryrefslogtreecommitdiffstats
path: root/build/f_repos/patch/fuel-main
diff options
context:
space:
mode:
authorStefan K. Berg <stefan.k.berg@ericsson.com>2016-10-12 16:42:35 +0200
committerStefan K. Berg <stefan.k.berg@ericsson.com>2016-11-15 15:35:15 +0100
commit9f8aff6636e0d86834178b461802f3e7cb95189d (patch)
tree3bbfec85cda9774295b5f30f8417ee36e512368d /build/f_repos/patch/fuel-main
parent38579142c683dbf26a6560d53d900111f4df4f6b (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')
-rw-r--r--build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch88
-rw-r--r--build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch64
-rw-r--r--build/f_repos/patch/fuel-main/0002-OPNFV-showmenu-yes-in-isolinux.cfg.patch24
-rw-r--r--build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch59
-rw-r--r--build/f_repos/patch/fuel-main/0004-xorriso-fails-to-add-files-with-path-longer-then-240.patch24
5 files changed, 64 insertions, 195 deletions
diff --git a/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch b/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch
deleted file mode 100644
index 446d0b6bd..000000000
--- a/build/f_repos/patch/fuel-main/0001-OPNFV-Additions-to-bootstrap_admin_node.sh.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From: Fuel OPNFV <fuel@opnfv.org>
-Date: Mon, 13 Jun 2016 22:23:57 +0200
-Subject: [PATCH] OPNFV: Additions to bootstrap_admin_node.sh
-
----
- iso/bootstrap_admin_node.sh | 39 +++++++++++++++++++++++++++++++--------
- 1 file changed, 31 insertions(+), 8 deletions(-)
-
-diff --git a/iso/bootstrap_admin_node.sh b/iso/bootstrap_admin_node.sh
-index 3197c91..db3123d 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,9 +392,7 @@ if [ ! -f /etc/fuel_build_id ]; then
- ln -s ${wwwdir}/${OPENSTACK_VERSION}/ubuntu ${wwwdir}/ubuntu
- fi
-
--# 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
-@@ -540,8 +563,8 @@ else
- 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
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
diff --git a/build/f_repos/patch/fuel-main/0002-OPNFV-showmenu-yes-in-isolinux.cfg.patch b/build/f_repos/patch/fuel-main/0002-OPNFV-showmenu-yes-in-isolinux.cfg.patch
deleted file mode 100644
index dbff8c7d4..000000000
--- a/build/f_repos/patch/fuel-main/0002-OPNFV-showmenu-yes-in-isolinux.cfg.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Fuel OPNFV <fuel@opnfv.org>
-Date: Mon, 13 Jun 2016 22:23:57 +0200
-Subject: [PATCH] OPNFV: showmenu=yes in isolinux.cfg
-
----
- iso/isolinux/isolinux.cfg | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/iso/isolinux/isolinux.cfg b/iso/isolinux/isolinux.cfg
-index c6b1ed9..77a4b18 100644
---- a/iso/isolinux/isolinux.cfg
-+++ b/iso/isolinux/isolinux.cfg
-@@ -19,9 +19,9 @@ label nailgun
- menu label ^1. Fuel Install (Static IP)
- menu default
- kernel vmlinuz
-- append initrd=initrd.img net.ifnames=0 biosdevname=0 inst.repo=cdrom:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ inst.ks=cdrom:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:eth0:off::: nameserver=10.20.0.1
-+ append initrd=initrd.img net.ifnames=0 biosdevname=0 inst.repo=cdrom:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ inst.ks=cdrom:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:eth0:off::: nameserver=10.20.0.1 showmenu=yes
-
- label nailgunifname
- menu label ^2. Fuel Advanced Install (Static IP)
- kernel vmlinuz
-- append initrd=initrd.img inst.repo=cdrom:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ inst.ks=cdrom:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:adminif:off::: nameserver=10.20.0.1 ifname=adminif:XX:XX:XX:XX:XX:XX
-+ append initrd=initrd.img inst.repo=cdrom:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ inst.ks=cdrom:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:adminif:off::: nameserver=10.20.0.1 ifname=adminif:XX:XX:XX:XX:XX:XX showmenu=yes
diff --git a/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch b/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch
deleted file mode 100644
index 9469643c3..000000000
--- a/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From: Stanislaw Kardach <stanislaw.kardach@cavium.com>
-Date: Thu, 25 Feb 2016 13:31:19 +0100
-Subject: [PATCH] repo mirror: Allow multi-arch local mirrors
-
-This patch allows specifying multiple architectures via UBUNTU_ARCH in
-form of a list of space separated architectures. The first architecture
-in the list is considered primary and will be used for building all the
-deb packages by fuel-main. Additional architectures are added to allow
-targets of other architectures to use the mirror.
-NOTE: this imposes a requirement that all packages built are arch
-independent (which is true so far).
-
-Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- config.mk | 2 +-
- mirror/ubuntu/module.mk | 2 +-
- sandbox.mk | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/config.mk b/config.mk
-index 74ee039..45a3b30 100644
---- a/config.mk
-+++ b/config.mk
-@@ -49,7 +49,7 @@ UBUNTU_MINOR:=04
- UBUNTU_RELEASE_NUMBER:=$(UBUNTU_MAJOR).$(UBUNTU_MINOR)
- UBUNTU_KERNEL_FLAVOR?=lts-trusty
- UBUNTU_NETBOOT_FLAVOR?=netboot
--UBUNTU_ARCH:=amd64
-+UBUNTU_ARCH?=amd64
- UBUNTU_IMAGE_RELEASE:=$(UBUNTU_MAJOR)$(UBUNTU_MINOR)
- SEPARATE_IMAGES?=/boot,ext2 /,ext4
-
-diff --git a/mirror/ubuntu/module.mk b/mirror/ubuntu/module.mk
-index 7a9466e..fe1ada2 100644
---- a/mirror/ubuntu/module.mk
-+++ b/mirror/ubuntu/module.mk
-@@ -81,7 +81,7 @@ $(BUILD_DIR)/mirror/ubuntu/mirror.done:
- --root=$(MIRROR_MOS_UBUNTU_ROOT) \
- --dist=$(MIRROR_MOS_UBUNTU_SUITE) \
- --section=$(subst $(space),$(comma),$(MIRROR_MOS_UBUNTU_SECTION)) \
-- --arch=$(UBUNTU_ARCH) \
-+ --arch=$(shell echo $(UBUNTU_ARCH) | tr ' ' ',') \
- $(LOCAL_MIRROR_UBUNTU)/
- rm -rf $(LOCAL_MIRROR_UBUNTU)/.temp $(LOCAL_MIRROR_UBUNTU)/project
- $(ACTION.TOUCH)
-diff --git a/sandbox.mk b/sandbox.mk
-index 4bc3962..5ffddbd 100644
---- a/sandbox.mk
-+++ b/sandbox.mk
-@@ -188,7 +188,7 @@ touch $(SANDBOX_UBUNTU)/etc/init.d/.legacy-bootordering
- mkdir -p $(SANDBOX_UBUNTU)/usr/sbin
- cp -a $(BUILD_DIR)/policy-rc.d $(SANDBOX_UBUNTU)/usr/sbin
- echo "Running debootstrap"
--sudo debootstrap --no-check-gpg --include=ca-certificates --arch=$(UBUNTU_ARCH) $(MIRROR_UBUNTU_SUITE) $(SANDBOX_UBUNTU) $(MIRROR_UBUNTU_METHOD)://$(MIRROR_UBUNTU)$(MIRROR_UBUNTU_ROOT)
-+sudo debootstrap --no-check-gpg --include=ca-certificates --arch=$(word 1,$(UBUNTU_ARCH)) $(MIRROR_UBUNTU_SUITE) $(SANDBOX_UBUNTU) $(MIRROR_UBUNTU_METHOD)://$(MIRROR_UBUNTU)$(MIRROR_UBUNTU_ROOT)
- if [ -e $(SANDBOX_UBUNTU)/etc/resolv.conf ]; then sudo cp -a $(SANDBOX_UBUNTU)/etc/resolv.conf $(SANDBOX_UBUNTU)/etc/resolv.conf.orig; fi
- sudo cp /etc/resolv.conf $(SANDBOX_UBUNTU)/etc/resolv.conf
- if [ -e $(SANDBOX_UBUNTU)/etc/hosts ]; then sudo cp -a $(SANDBOX_UBUNTU)/etc/hosts $(SANDBOX_UBUNTU)/etc/hosts.orig; fi
diff --git a/build/f_repos/patch/fuel-main/0004-xorriso-fails-to-add-files-with-path-longer-then-240.patch b/build/f_repos/patch/fuel-main/0004-xorriso-fails-to-add-files-with-path-longer-then-240.patch
deleted file mode 100644
index 734523040..000000000
--- a/build/f_repos/patch/fuel-main/0004-xorriso-fails-to-add-files-with-path-longer-then-240.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Artem Silenkov <asilenkov@mirantis.com>
-Date: Tue, 22 Sep 2015 21:54:44 +0300
-Subject: [PATCH] xorriso fails to add files with path longer then 240
-
-joliet-long option added to xorriso command line
-
-Change-Id: I97016cf3e6a554f44d839740ba7d210337435cdc
-Related-Bug: #1498619
----
- iso/module.mk | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/iso/module.mk b/iso/module.mk
-index 8995378..0073068 100644
---- a/iso/module.mk
-+++ b/iso/module.mk
-@@ -174,6 +174,7 @@ $(ISO_PATH): $(BUILD_DIR)/iso/isoroot.done
- -V $(ISO_VOLUME_ID) -p $(ISO_VOLUME_PREP) \
- -J -R \
- -graft-points \
-+ -joliet-long \
- -b isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
- -isohybrid-mbr /usr/lib/syslinux/isohdpfx.bin \
- -eltorito-alt-boot -e images/efiboot.img -no-emul-boot \