diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-12-14 17:25:35 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-12-14 17:54:12 +0100 |
commit | bb4f4b671e3043b0b1483bf44b707b092b2333af (patch) | |
tree | 24cd7c2fad3d2134e2a667a375ef45923375bb77 /patches/fuel-library/multiarch-efi | |
parent | 742136a7fdb450f7d21c91b94c3054d4ec8de60e (diff) |
fuel-library: pp: cobbler: Fix CentOS ver detect
Upstream fuel-library bug report: [1].
Recently, CentOS released version 7.3.1611, which triggered a latent
bug in fuel-library puppet scripts related to differentiating between
6.x and 7.x major versions: 7.3.1611 is wrongly detected as 6.x,
leading to the wrong packages being attempted to be installed,
leaving nailgun server service broken on the Fuel Master node.
This change forces the match at the beggining of the version string
(e.g. "/^6.+/: {" instead of "/6.+/: {"), so the new CentOS 7.3.1611
no longer matches the condition for 6.x).
This patch will soon be obsoleted by the Netwon switch.
However, until that happens, we need to ensure CentOS 7.3 is not
breaking the deploy.
[1] https://bugs.launchpad.net/fuel/+bug/1649895
JIRA: FUEL-238
Change-Id: Iebda7e13d66191614c3552dacb6c80091215baf5
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/fuel-library/multiarch-efi')
-rw-r--r-- | patches/fuel-library/multiarch-efi/0002-Add-cobbler-grub-aarch64-to-cobbler-dependencies.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/fuel-library/multiarch-efi/0002-Add-cobbler-grub-aarch64-to-cobbler-dependencies.patch b/patches/fuel-library/multiarch-efi/0002-Add-cobbler-grub-aarch64-to-cobbler-dependencies.patch index 14d06ef5..8314663f 100644 --- a/patches/fuel-library/multiarch-efi/0002-Add-cobbler-grub-aarch64-to-cobbler-dependencies.patch +++ b/patches/fuel-library/multiarch-efi/0002-Add-cobbler-grub-aarch64-to-cobbler-dependencies.patch @@ -23,11 +23,11 @@ index 267c18c..9782c4c 100644 @@ -25,10 +25,10 @@ class cobbler::packages { $pexpect_package = 'pexpect' case $::operatingsystemrelease { - /6.+/: { + /^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.+/: { + /^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'] } |