Fixes Facts string comparisons in CentOS 7

CentOS Project has adopted a new rule for versioning numbers. The major number matches the RHEL major number, but the minor number is generated from the release date. For example, CentOS 7.1407. Change-Id: I16876d033bdb8ee47fa7b3c2d25c41e6f1c1c83e Fixes: rhbz#1117035 Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
redhat-openstack · Jul 8, 2014 · 0040c63 · 0040c63 · kk47 · Aug 9, 2014
1 parent 204f39e
commit 0040c63
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/packstack/puppet/templates/amqp.pp b/packstack/puppet/templates/amqp.pp
@@ -44,7 +44,7 @@
     }
 
     'RedHat', 'CentOS': {
-      if $::operatingsystemrelease >= 7 {
+      if $::operatingsystemmajrelease >= 7 {
         $config = '/etc/qpid/qpidd.conf'
       } else {
         $config = '/etc/qpidd.conf'

diff --git a/packstack/puppet/templates/mysql_install.pp b/packstack/puppet/templates/mysql_install.pp
@@ -1,6 +1,6 @@
 
 # on EL6 we need to wait for innodb changes before starting mysqld
-if $::operatingsystem in ['RedHat','CentOS','Scientific'] and $::operatingsystemrelease < 7 {
+if $::operatingsystem in ['RedHat','CentOS','Scientific'] and $::operatingsystemmajrelease < 7 {
     $manage_service = false
     service { 'mysqld':
       enable  => true,

diff --git a/packstack/puppet/templates/prescript.pp b/packstack/puppet/templates/prescript.pp
@@ -10,7 +10,7 @@
 }
 
 # For older RHEL-6 releases kernel/iptools does not support netns
-if $::operatingsystem in $el_releases and $::operatingsystemrelease < 7 {
+if $::operatingsystem in $el_releases and $::operatingsystemmajrelease < 7 {
   $info = "The RDO kernel that includes network namespace (netns) support has been installed on host $::ipaddress."
   $warning = " This is a community supplied kernel and is not officially supported by Red Hat. Installing this kernel on RHEL systems may impact your ability to get support from Red Hat."