diff options
| author |   Stanislaw Kardach <kda@semihalf.com> | 2016-03-29 15:06:02 +0200 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-02 14:16:25 +0000 |
| commit | ca12251eb36ddf1efc4d6bbed37a6e002ae110c2 (patch) | |
| tree | 54758b57f5f1bc42f7707c2706f3eeee11b6a51e /patches/fuel-main/0004-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch | |
| parent | 6398937dfe68ad9c7ce2133c866edb6a7bd69b32 (diff) | |
Clean up and fix Libvirt and Ceph
[ Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> ]
* Fix upload_cirros timeout
* Workaround for default video device in nova
* Fix syntax and increase TestVM's RAM requirements
[ Alexandru Avadanii <Alexandru.Avadanii@enea.com> ]
* 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 <stanislaw.kardach@caviumnetworks.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 0f762e556ea7b2393f56ca7fb8e06f66f99880aa)
Change-Id: I24f84e8b100b3f1542f9f51db93ebad9831b9b14
Diffstat (limited to 'patches/fuel-main/0004-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch')
| -rw-r--r-- | patches/fuel-main/0004-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch | 39 |
1 files changed, 39 insertions, 0 deletions
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 <florin.dumitrascu@enea.com> +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 |