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

diff --git a/patches/fuel-library/0014-Add-cobbler-grub-aarch64-to-cobbler-dependencies.patch b/patches/fuel-library/0014-Add-cobbler-grub-aarch64-to-cobbler-dependencies.patch
new file mode 100644 (file)
index 0000000..14d06ef
--- /dev/null
+++ b/patches/fuel-library/0014-Add-cobbler-grub-aarch64-to-cobbler-dependencies.patch
@@ -0,0 +1,35 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Fri, 13 May 2016 23:06:28 +0200
+Subject: [PATCH] Add cobbler-grub-aarch64 to cobbler dependencies.
+
+The aarch64 grub EFI loader, packaged as an RPM and previously
+installed in the nailgun docker container in /var/lib/cobbler,
+is now added as a cobbler dependency in puppet and installed
+on the Fuel master node.
+
+[Alexandru.Avadanii@enea.com]
+Reworked based on Florin's work for the docker container.
+
+Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com>
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ deployment/puppet/cobbler/manifests/packages.pp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/deployment/puppet/cobbler/manifests/packages.pp b/deployment/puppet/cobbler/manifests/packages.pp
+index 267c18c..9782c4c 100644
+--- a/deployment/puppet/cobbler/manifests/packages.pp
++++ b/deployment/puppet/cobbler/manifests/packages.pp
+@@ -25,10 +25,10 @@ class cobbler::packages {
+       $pexpect_package     = 'pexpect'
+       case $::operatingsystemrelease {
+         /6.+/: {
+-          $cobbler_additional_packages = ['xinetd', 'tftp-server', 'syslinux', 'wget', 'python-ipaddr','fence-agents', 'bind-utils']
++          $cobbler_additional_packages = ['xinetd', 'tftp-server', 'syslinux', 'wget', 'python-ipaddr','fence-agents', 'bind-utils', 'cobbler-grub-aarch64']
+         }
+         /7.+/: {
+-          $cobbler_additional_packages = ['xinetd', 'tftp-server', 'syslinux', 'wget', 'python-ipaddr','fence-agents-all', 'bind-utils']
++          $cobbler_additional_packages = ['xinetd', 'tftp-server', 'syslinux', 'wget', 'python-ipaddr','fence-agents-all', 'bind-utils', 'cobbler-grub-aarch64']
+         }
+       }
+     }

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 (file)
index e3d13b8..0000000
--- 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