diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-13 23:14:08 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-16 12:02:07 +0000 |
| commit | 0371a41f7e84f157bd84e8ee627563180c40d9d8 (patch) | |
| tree | c93de2665de14e85834b909c5c45da0b78c456b1 /patches/fuel-main | |
| parent | 902f8b6ec6303fdd4c01dfe2889d0107e103fe6b (diff) | |
Rebase: p/f-{main,lib}: cobbler-grub-aarch64 dep.
Since Fuel 9.0 drops containers on Fuel master (see spec
"Get rid of docker containers on the master node"), we
need to handle the install of cobbler-grub-aarch64 in a
different place.
So, handle cobbler-grub-aarch64 loader install as a cobbler
dependency in puppet.
[1] https://blueprints.launchpad.net/fuel/+spec/
get-rid-docker-containers
Change-Id: Ia42211b4d0aa54ba67862f30f8c7975d2aa09392
Diffstat (limited to 'patches/fuel-main')
| -rw-r--r-- | patches/fuel-main/0003-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/patches/fuel-main/0003-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch b/patches/fuel-main/0003-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch deleted file mode 100644 index e3d13b85..00000000 --- a/patches/fuel-main/0003-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 |