[openstack-packstack/icehouse-epel7: 1/4] disable prescript checks for el7

Martin Mágr mmagr at fedoraproject.org
Tue Mar 25 11:13:06 UTC 2014


commit cbc06c22da54c4226bdf5c4147b4166fec90f621
Author: Alan Pevec <apevec at redhat.com>
Date:   Thu Feb 6 19:08:56 2014 +0100

    disable prescript checks for el7

 el7-prescript.patch      |   21 +++++++++++++++++++++
 openstack-packstack.spec |    7 ++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/el7-prescript.patch b/el7-prescript.patch
new file mode 100644
index 0000000..1d83b2f
--- /dev/null
+++ b/el7-prescript.patch
@@ -0,0 +1,21 @@
+diff -ruN packstack-2013.2.1dev956/packstack/puppet/templates/prescript.pp packstack-2013.2.1dev956.prescript/packstack/puppet/templates/prescript.pp
+--- packstack-2013.2.1dev956/packstack/puppet/templates/prescript.pp	2013-12-09 12:24:13.000000000 +0100
++++ packstack-2013.2.1dev956.prescript/packstack/puppet/templates/prescript.pp	2014-02-06 20:41:08.167387233 +0100
+@@ -1,17 +0,0 @@
+-
+-if $::operatingsystem != "Fedora" {
+-    package{ 'openstack-selinux':
+-        ensure => present,
+-    }
+-}
+-
+-$info = "The RDO kernel that includes network namespace (netns) support has been installed on host $::ipaddress."
+-if $::operatingsystem == 'RedHat' {
+-    $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."
+-} else {
+-    $warning = ""
+-}
+-
+-class { 'packstack::netns':
+-    warning => "${info}${warning}"
+-}
diff --git a/openstack-packstack.spec b/openstack-packstack.spec
index 83eb775..6c6d828 100644
--- a/openstack-packstack.spec
+++ b/openstack-packstack.spec
@@ -6,7 +6,7 @@
 
 Name:           openstack-packstack
 Version:        2014.1.1
-Release:        0.1.dev%{git_revno}%{?dist}
+Release:        0.2.dev%{git_revno}%{?dist}
 Summary:        Openstack Install Utility
 
 Group:          Applications/System
@@ -14,6 +14,7 @@ License:        ASL 2.0 and GPLv2
 URL:            https://github.com/stackforge/packstack
 # Tarball is created by bin/release.sh
 Source0:        http://mmagr.fedorapeople.org/downloads/packstack/packstack-%{version}dev%{git_revno}.tar.gz
+Patch0:         el7-prescript.patch
 
 BuildArch:      noarch
 
@@ -63,6 +64,7 @@ This package contains documentation files for Packstack.
 
 %prep
 %setup -n packstack-%{version}dev%{git_revno}
+%patch0 -p1
 
 # Sanitizing a lot of the files in the puppet modules, they come from seperate upstream projects
 find packstack/puppet/modules \( -name .fixtures.yml -o -name .gemfile -o -name ".travis.yml" -o -name .rspec \) -exec rm {} +
@@ -131,6 +133,9 @@ install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
 # changelog --------------------------------------------------------------------
 
 %changelog
+* Mon Mar 03 2014 Alan Pevec <apevec at redhat.com> - 2014.1.1-0.2.dev992
+- disable prescript checks for el7
+
 * Mon Feb 24 2014 Martin Mágr <mmagr at redhat.com> - 2014.1.1-0.1.dev992
 - Added openstack-packstack-doc subpackage
 - Added openstack-packstack-puppet subpackage (rhbz#1063980)


More information about the scm-commits mailing list