From ca12251eb36ddf1efc4d6bbed37a6e002ae110c2 Mon Sep 17 00:00:00 2001 From: Stanislaw Kardach Date: Tue, 29 Mar 2016 15:06:02 +0200 Subject: Clean up and fix Libvirt and Ceph [ Stanislaw Kardach ] * Fix upload_cirros timeout * Workaround for default video device in nova * Fix syntax and increase TestVM's RAM requirements [ Alexandru Avadanii ] * Cleanup: Obsolete SEPARATE_IMAGES. * Nova libvirt drv: arm64: Update console default. * fuel{,-main}: Cleanup obsolete patches. * nova: Fix inject for direct boot with part table. See https://bugs.launchpad.net/nova/+bug/1290455 for full bug description. For now, we detect direct kernel boot with a partition table inside disk image by passing target_partition when root kernel arg points to a partition (instead of the whole disk). * Drop obsolete/done TODO entries. * Nova: Fix os cmd line parsing for list case. * ceph: Fix obsolete XFS mount param. * Fix out-of-order embedded patch hunks. Signed-off-by: Stanislaw Kardach Signed-off-by: Alexandru Avadanii (cherry picked from commit 0f762e556ea7b2393f56ca7fb8e06f66f99880aa) Change-Id: I24f84e8b100b3f1542f9f51db93ebad9831b9b14 --- patches/fuel-main/0003-Follow-redirects.patch | 21 ------------ .../fuel-main/0003-Make-cpio-accept-symlinks.patch | 27 +++++++++++++++ ...-Add-apt-https-support-package-to-sandbox.patch | 21 ------------ ...er-grub-aarch64-RPM-reinstall-to-start.sh.patch | 39 ++++++++++++++++++++++ .../fuel-main/0005-Make-cpio-accept-symlinks.patch | 27 --------------- ...er-grub-aarch64-RPM-reinstall-to-start.sh.patch | 39 ---------------------- 6 files changed, 66 insertions(+), 108 deletions(-) delete mode 100644 patches/fuel-main/0003-Follow-redirects.patch create mode 100644 patches/fuel-main/0003-Make-cpio-accept-symlinks.patch delete mode 100644 patches/fuel-main/0004-Add-apt-https-support-package-to-sandbox.patch create mode 100644 patches/fuel-main/0004-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch delete mode 100644 patches/fuel-main/0005-Make-cpio-accept-symlinks.patch delete mode 100644 patches/fuel-main/0006-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch (limited to 'patches/fuel-main') diff --git a/patches/fuel-main/0003-Follow-redirects.patch b/patches/fuel-main/0003-Follow-redirects.patch deleted file mode 100644 index 17ae85d5..00000000 --- a/patches/fuel-main/0003-Follow-redirects.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Stanislaw Kardach -Date: Tue, 1 Mar 2016 09:35:24 +0100 -Subject: [PATCH] Follow redirects - ---- - config.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config.mk b/config.mk -index ae4766b..2a99278 100644 ---- a/config.mk -+++ b/config.mk -@@ -271,7 +271,7 @@ USE_PREDEFINED_FUEL_LIB_PUPPET_MODULES?= - - # If the URL given ended with target.txt then is't a pointer to a snapshot that - # should be unlinked. If it is not - return it as is. --expand_repo_url=$(shell url=$1; echo $${url} | grep -q -e '.*\.target\.txt$$' && echo "$${url%/*}/$$(curl -sSf $$url | head -1)/x86_64/" || echo $${url}) -+expand_repo_url=$(shell url=$1; echo $${url} | grep -q -e '.*\.target\.txt$$' && echo "$${url%/*}/$$(curl -sSfL $$url | head -1)/x86_64/" || echo $${url}) - - # Expand repo URLs now - #MIRROR_CENTOS:=$(call expand_repo_url,$(MIRROR_CENTOS)) diff --git a/patches/fuel-main/0003-Make-cpio-accept-symlinks.patch b/patches/fuel-main/0003-Make-cpio-accept-symlinks.patch new file mode 100644 index 00000000..00c2ce41 --- /dev/null +++ b/patches/fuel-main/0003-Make-cpio-accept-symlinks.patch @@ -0,0 +1,27 @@ +From: Stanislaw Kardach +Date: Wed, 2 Mar 2016 10:04:32 +0100 +Subject: [PATCH] Make cpio accept symlinks + +--- + bootstrap/module.mk | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/bootstrap/module.mk b/bootstrap/module.mk +index cb09691..3f28172 100644 +--- a/bootstrap/module.mk ++++ b/bootstrap/module.mk +@@ -230,11 +230,11 @@ $(BUILD_DIR)/bootstrap/prepare-initram-root.done: \ + + # Installing kernel modules + find $(LOCAL_MIRROR_CENTOS_OS_BASEURL) -name '$(KERNEL_PATTERN)' | xargs rpm2cpio | \ +- ( cd $(INITRAMROOT); sudo cpio -idm './lib/modules/*' './boot/vmlinuz*' ) ++ ( cd $(INITRAMROOT); sudo cpio --extract-over-symlinks -idm './lib/modules/*' './boot/vmlinuz*' ) + find $(LOCAL_MIRROR_CENTOS_OS_BASEURL) -name '$(KERNEL_FIRMWARE_PATTERN)' | xargs rpm2cpio | \ +- ( cd $(INITRAMROOT); sudo cpio -idm './lib/firmware/*' ) ++ ( cd $(INITRAMROOT); sudo cpio --extract-over-symlinks -idm './lib/firmware/*' ) + find $(LOCAL_MIRROR_CENTOS_OS_BASEURL) -name 'libmlx4*' | xargs rpm2cpio | \ +- ( cd $(INITRAMROOT); sudo cpio -idm './etc/*' './usr/lib64/*' ) ++ ( cd $(INITRAMROOT); sudo cpio --extract-over-symlinks -idm './etc/*' './usr/lib64/*' ) + for version in `ls -1 $(INITRAMROOT)/lib/modules`; do \ + sudo depmod -b $(INITRAMROOT) $$version; \ + done diff --git a/patches/fuel-main/0004-Add-apt-https-support-package-to-sandbox.patch b/patches/fuel-main/0004-Add-apt-https-support-package-to-sandbox.patch deleted file mode 100644 index ee92f2f1..00000000 --- a/patches/fuel-main/0004-Add-apt-https-support-package-to-sandbox.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Stanislaw Kardach -Date: Tue, 1 Mar 2016 11:06:32 +0100 -Subject: [PATCH] Add apt https support package to sandbox - ---- - sandbox.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sandbox.mk b/sandbox.mk -index 18757a1..c450d19 100644 ---- a/sandbox.mk -+++ b/sandbox.mk -@@ -183,7 +183,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 qemu-debootstrap" --sudo qemu-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) -+sudo qemu-debootstrap --no-check-gpg --include=ca-certificates,apt-transport-https --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/patches/fuel-main/0004-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch b/patches/fuel-main/0004-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch new file mode 100644 index 00000000..e3d13b85 --- /dev/null +++ b/patches/fuel-main/0004-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch @@ -0,0 +1,39 @@ +From: Florin Dumitrascu +Date: Fri, 4 Mar 2016 17:19:41 +0100 +Subject: [PATCH] Add cobbler-grub-aarch64 RPM reinstall to start.sh + +Because /var/lib/cobbler is mounted as a volume, new cobbler aarch64 +grub loader packaged as an RPM (cobbler-grub-aarch64) should be +reinstalled if its files are missing on Docker container start. +--- + docker/cobbler/setup.sh | 2 +- + docker/cobbler/start.sh | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/docker/cobbler/setup.sh b/docker/cobbler/setup.sh +index a7fce0c..90627a8 100644 +--- a/docker/cobbler/setup.sh ++++ b/docker/cobbler/setup.sh +@@ -31,7 +31,7 @@ yum update -y + + ln -s /etc/dnsmasq.conf /etc/cobbler.dnsmasq.conf + +-packages="httpd cobbler dnsmasq xinetd tftp-server" ++packages="httpd cobbler cobbler-grub-aarch64 dnsmasq xinetd tftp-server" + echo $packages | xargs -n1 yum install -y + + +diff --git a/docker/cobbler/start.sh b/docker/cobbler/start.sh +index 3c5d411..c1a359b 100644 +--- a/docker/cobbler/start.sh ++++ b/docker/cobbler/start.sh +@@ -18,6 +18,9 @@ fi + if rpm -V cobbler-web | grep -q missing; then + yum reinstall -q -y cobbler-web + fi ++if rpm -V cobbler-grub-aarch64 | grep -q missing; then ++ yum reinstall -q -y cobbler-grub-aarch64 ++fi + + + # Run puppet to apply custom config diff --git a/patches/fuel-main/0005-Make-cpio-accept-symlinks.patch b/patches/fuel-main/0005-Make-cpio-accept-symlinks.patch deleted file mode 100644 index 00c2ce41..00000000 --- a/patches/fuel-main/0005-Make-cpio-accept-symlinks.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Stanislaw Kardach -Date: Wed, 2 Mar 2016 10:04:32 +0100 -Subject: [PATCH] Make cpio accept symlinks - ---- - bootstrap/module.mk | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/bootstrap/module.mk b/bootstrap/module.mk -index cb09691..3f28172 100644 ---- a/bootstrap/module.mk -+++ b/bootstrap/module.mk -@@ -230,11 +230,11 @@ $(BUILD_DIR)/bootstrap/prepare-initram-root.done: \ - - # Installing kernel modules - find $(LOCAL_MIRROR_CENTOS_OS_BASEURL) -name '$(KERNEL_PATTERN)' | xargs rpm2cpio | \ -- ( cd $(INITRAMROOT); sudo cpio -idm './lib/modules/*' './boot/vmlinuz*' ) -+ ( cd $(INITRAMROOT); sudo cpio --extract-over-symlinks -idm './lib/modules/*' './boot/vmlinuz*' ) - find $(LOCAL_MIRROR_CENTOS_OS_BASEURL) -name '$(KERNEL_FIRMWARE_PATTERN)' | xargs rpm2cpio | \ -- ( cd $(INITRAMROOT); sudo cpio -idm './lib/firmware/*' ) -+ ( cd $(INITRAMROOT); sudo cpio --extract-over-symlinks -idm './lib/firmware/*' ) - find $(LOCAL_MIRROR_CENTOS_OS_BASEURL) -name 'libmlx4*' | xargs rpm2cpio | \ -- ( cd $(INITRAMROOT); sudo cpio -idm './etc/*' './usr/lib64/*' ) -+ ( cd $(INITRAMROOT); sudo cpio --extract-over-symlinks -idm './etc/*' './usr/lib64/*' ) - for version in `ls -1 $(INITRAMROOT)/lib/modules`; do \ - sudo depmod -b $(INITRAMROOT) $$version; \ - done diff --git a/patches/fuel-main/0006-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch b/patches/fuel-main/0006-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch deleted file mode 100644 index e3d13b85..00000000 --- a/patches/fuel-main/0006-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Florin Dumitrascu -Date: Fri, 4 Mar 2016 17:19:41 +0100 -Subject: [PATCH] Add cobbler-grub-aarch64 RPM reinstall to start.sh - -Because /var/lib/cobbler is mounted as a volume, new cobbler aarch64 -grub loader packaged as an RPM (cobbler-grub-aarch64) should be -reinstalled if its files are missing on Docker container start. ---- - docker/cobbler/setup.sh | 2 +- - docker/cobbler/start.sh | 3 +++ - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/docker/cobbler/setup.sh b/docker/cobbler/setup.sh -index a7fce0c..90627a8 100644 ---- a/docker/cobbler/setup.sh -+++ b/docker/cobbler/setup.sh -@@ -31,7 +31,7 @@ yum update -y - - ln -s /etc/dnsmasq.conf /etc/cobbler.dnsmasq.conf - --packages="httpd cobbler dnsmasq xinetd tftp-server" -+packages="httpd cobbler cobbler-grub-aarch64 dnsmasq xinetd tftp-server" - echo $packages | xargs -n1 yum install -y - - -diff --git a/docker/cobbler/start.sh b/docker/cobbler/start.sh -index 3c5d411..c1a359b 100644 ---- a/docker/cobbler/start.sh -+++ b/docker/cobbler/start.sh -@@ -18,6 +18,9 @@ fi - if rpm -V cobbler-web | grep -q missing; then - yum reinstall -q -y cobbler-web - fi -+if rpm -V cobbler-grub-aarch64 | grep -q missing; then -+ yum reinstall -q -y cobbler-grub-aarch64 -+fi - - - # Run puppet to apply custom config -- cgit 1.2.3-korg