openstack/fuel-library
Code Issues Proposed changes

puppet: cobbler: Fix CentOS version detection

Browse Source 
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).

Closes-bug: 1649895

Change-Id: I8873701d24e406e2804b9e654decb776ec3bf61c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
This commit is contained in:
Alexandru Avadanii 2016-12-14 15:40:41 +01:00 committed by Alexandru Avadanii
parent 51014d902e
commit 9d3f3f1fd0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/puppet/cobbler/manifests/packages.pp
View File

@ -24,10 +24,10 @@ class cobbler::packages {
$openssh_package = 'openssh-clients' $openssh_package = 'openssh-clients'
$pexpect_package = 'pexpect' $pexpect_package = 'pexpect'
case $::operatingsystemrelease { 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']
} }
/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']
} }
} }