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-library/0014-Add-cobbler-grub-aarch64-to-cobbler-dependencies.patch | |
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-library/0014-Add-cobbler-grub-aarch64-to-cobbler-dependencies.patch')
-rw-r--r-- | patches/fuel-library/0014-Add-cobbler-grub-aarch64-to-cobbler-dependencies.patch | 35 |
1 files changed, 35 insertions, 0 deletions
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 index 00000000..14d06ef5 --- /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'] + } + } + } |