From f361df2eee6ebd00c564ebecfc84566f3f680cf9 Mon Sep 17 00:00:00 2001
From: Arif Ali <mail@arif-ali.co.uk>
Date: Thu, 6 Nov 2014 23:52:19 +0000
Subject: [PATCH] patches no longer required for puppet/packstack for el7

Signed-off-by: Arif Ali <mail@arif-ali.co.uk>
---
 .../packstack/c7-patches/apache-puppet.patch  | 11 ----
 .../packstack/c7-patches/mysql-puppet.patch   | 60 -------------------
 .../packstack/c7-patches/nova-puppet.patch    | 15 -----
 .../data/packstack/c7-patches/python.patch    | 38 ------------
 4 files changed, 124 deletions(-)
 delete mode 100644 xcat/postscripts/data/packstack/c7-patches/apache-puppet.patch
 delete mode 100644 xcat/postscripts/data/packstack/c7-patches/mysql-puppet.patch
 delete mode 100644 xcat/postscripts/data/packstack/c7-patches/nova-puppet.patch
 delete mode 100644 xcat/postscripts/data/packstack/c7-patches/python.patch

diff --git a/xcat/postscripts/data/packstack/c7-patches/apache-puppet.patch b/xcat/postscripts/data/packstack/c7-patches/apache-puppet.patch
deleted file mode 100644
index 38887c7..0000000
--- a/xcat/postscripts/data/packstack/c7-patches/apache-puppet.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/manifests/version.pp     2014-08-27 12:24:57.659804760 +0100
-+++ b/manifests/version.pp  2014-08-27 12:25:06.841971767 +0100
-@@ -5,7 +5,7 @@
- class apache::version {
-   case $::osfamily {
-     'RedHat': {
--      if ($::operatingsystem == 'Fedora' and $::operatingsystemrelease >= 18) or ($::operatingsystem != 'Fedora' and $::operatingsystemrelease >= 7) {
-+      if ($::operatingsystem == 'Fedora' and $::operatingsystemrelease >= 18) or ($::operatingsystem != 'Fedora' and $::operatingsystemmajrelease >= 7) {
-         $default = 2.4
-       } else {
-         $default = 2.2
diff --git a/xcat/postscripts/data/packstack/c7-patches/mysql-puppet.patch b/xcat/postscripts/data/packstack/c7-patches/mysql-puppet.patch
deleted file mode 100644
index e7ea23b..0000000
--- a/xcat/postscripts/data/packstack/c7-patches/mysql-puppet.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/manifests/params.pp b/manifests/params.pp
-index 0e91e81..f1964d4 100644
---- a/manifests/params.pp
-+++ b/manifests/params.pp
-@@ -38,8 +38,8 @@
-             $provider = 'mysql'
-           }
-         }
--        'RedHat': {
--          if $::operatingsystemrelease >= 7 {
-+        /^(RedHat|CentOS|Scientific)$/: {
-+          if $::operatingsystemmajrelease >= 7 {
-             $provider = 'mariadb'
-           } else {
-             $provider = 'mysql'
-diff --git a/spec/classes/mysql_server_spec.rb b/spec/classes/mysql_server_spec.rb
-index e21f22c..3184f65 100644
---- a/spec/classes/mysql_server_spec.rb
-+++ b/spec/classes/mysql_server_spec.rb
-@@ -75,6 +75,40 @@
-     end
-   end
- 
-+  context 'mysql::server::install on RHEL 7' do
-+    let :facts do
-+      { :osfamily                  => 'RedHat',
-+        :operatingsystem           => 'RedHat',
-+        :operatingsystemmajrelease => 7
-+      }
-+    end
-+
-+    let(:params) {{ :package_ensure => 'present', :name => 'mariadb-server' }}
-+    it do
-+      should contain_package('mysql-server').with({
-+      :ensure => :present,
-+      :name   => 'mariadb-server',
-+    })
-+    end
-+  end
-+
-+  context 'mysql::server::install on CentOS 7' do
-+    let :facts do
-+      { :osfamily                  => 'RedHat',
-+        :operatingsystem           => 'CentOS',
-+        :operatingsystemmajrelease => 7
-+      }
-+    end
-+
-+    let(:params) {{ :package_ensure => 'present', :name => 'mariadb-server' }}
-+    it do
-+      should contain_package('mysql-server').with({
-+      :ensure => :present,
-+      :name   => 'mariadb-server',
-+    })
-+    end
-+  end
-+
-   context 'mysql::server::config' do
-     it do
-       should contain_file('/etc/mysql').with({
diff --git a/xcat/postscripts/data/packstack/c7-patches/nova-puppet.patch b/xcat/postscripts/data/packstack/c7-patches/nova-puppet.patch
deleted file mode 100644
index 236c61a..0000000
--- a/xcat/postscripts/data/packstack/c7-patches/nova-puppet.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/manifests/params.pp b/manifests/params.pp
-index f553567..e62f58d 100644
---- a/manifests/params.pp
-+++ b/manifests/params.pp
-@@ -44,8 +44,8 @@
-         'Fedora', 'RedHat': {
-           $special_service_provider = undef
-         }
--        'RedHat': {
--          if ($::operatingsystemrelease < 7) {
-+        'RedHat', 'CentOS', 'Scientific': {
-+          if ($::operatingsystemmajrelease < 7) {
-             $special_service_provider = 'init'
-           } else {
-             $special_service_provider = undef
diff --git a/xcat/postscripts/data/packstack/c7-patches/python.patch b/xcat/postscripts/data/packstack/c7-patches/python.patch
deleted file mode 100644
index 626196e..0000000
--- a/xcat/postscripts/data/packstack/c7-patches/python.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/packstack/puppet/templates/amqp.pp b/packstack/puppet/templates/amqp.pp
-index 15d7b5d..ca79707 100644
---- 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
-index 1364f79..6a33cba 100644
---- 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
-index 4c95292..32d53e8 100644
---- 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."
-