[openstack-packstack/icehouse-epel7: 4/4] Added patches required to run on RHEL7
Martin Mágr
mmagr at fedoraproject.org
Tue Mar 25 11:13:21 UTC 2014
commit cb107668512433fba0940dcef66e92eaaa902d61
Author: Martin Magr <mmagr at redhat.com>
Date: Thu Mar 20 20:19:42 2014 +0100
Added patches required to run on RHEL7
disable-nagios.patch | 19 +++++++++++++++++++
el7-horizon.patch | 18 ++++++++++++++++++
el7-swift.patch | 15 +++++++++++++++
openstack-packstack.spec | 20 +++++++++++++++++---
qpid-conf.patch | 39 +++++++++++++++++++++++++++++++++++++++
5 files changed, 108 insertions(+), 3 deletions(-)
---
diff --git a/disable-nagios.patch b/disable-nagios.patch
new file mode 100644
index 0000000..e79717f
--- /dev/null
+++ b/disable-nagios.patch
@@ -0,0 +1,19 @@
+diff --git a/packstack/plugins/prescript_000.py b/packstack/plugins/prescript_000.py
+index 5eb214e..cd036f7 100644
+--- a/packstack/plugins/prescript_000.py
++++ b/packstack/plugins/prescript_000.py
+@@ -175,11 +175,11 @@ def initConfig(controllerObject):
+ "NEED_CONFIRM" : False,
+ "CONDITION" : False },
+ {"CMD_OPTION" : "nagios-install",
+- "USAGE" : "Set to 'y' if you would like Packstack to install Nagios to monitor OpenStack hosts",
+- "PROMPT" : "Should Packstack install Nagios to monitor OpenStack hosts",
++ "USAGE" : "Set to 'y' if you would like Packstack to install Nagios to monitor OpenStack hosts (Not supported on RHEL-7)",
++ "PROMPT" : "Should Packstack install Nagios to monitor OpenStack hosts (Not supported on RHEL-7)",
+ "OPTION_LIST" : ["y", "n"],
+ "VALIDATORS" : [validators.validate_options],
+- "DEFAULT_VALUE" : 'y',
++ "DEFAULT_VALUE" : 'n',
+ "MASK_INPUT" : False,
+ "LOOSE_VALIDATION": False,
+ "CONF_NAME" : "CONFIG_NAGIOS_INSTALL",
diff --git a/el7-horizon.patch b/el7-horizon.patch
new file mode 100644
index 0000000..e812608
--- /dev/null
+++ b/el7-horizon.patch
@@ -0,0 +1,18 @@
+diff --git a/packstack/puppet/templates/horizon.pp b/packstack/puppet/templates/horizon.pp
+index 2be86e8..fa1c3cf 100644
+--- a/packstack/puppet/templates/horizon.pp
++++ b/packstack/puppet/templates/horizon.pp
+@@ -32,13 +32,6 @@ firewall { "001 horizon ${firewall_port} incoming":
+ action => 'accept',
+ }
+
+-if ($::selinux != "false"){
+- selboolean{'httpd_can_network_connect':
+- value => on,
+- persistent => true,
+- }
+-}
+-
+ #FIXME
+ # Ugly hack to avoid duplicate Listen directives on
+ # port 80
diff --git a/el7-swift.patch b/el7-swift.patch
new file mode 100644
index 0000000..4fe8b0c
--- /dev/null
+++ b/el7-swift.patch
@@ -0,0 +1,15 @@
+diff --git a/packstack/puppet/templates/swift_builder.pp b/packstack/puppet/templates/swift_builder.pp
+index 32387b2..f1c2f56 100644
+--- a/packstack/puppet/templates/swift_builder.pp
++++ b/packstack/puppet/templates/swift_builder.pp
+@@ -14,10 +14,3 @@ class { 'swift::ringserver':
+ @@swift::ringsync { ['account', 'object', 'container']:
+ ring_server => $swift_local_net_ip
+ }
+-
+-if ($::selinux != "false"){
+- selboolean{'rsync_export_all_ro':
+- value => on,
+- persistent => true,
+- }
+-}
diff --git a/openstack-packstack.spec b/openstack-packstack.spec
index 112eafc..e4651e0 100644
--- a/openstack-packstack.spec
+++ b/openstack-packstack.spec
@@ -1,12 +1,12 @@
%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
-%global git_revno 992
+%global git_revno 1018
# openstack-packstack ----------------------------------------------------------
Name: openstack-packstack
Version: 2014.1.1
-Release: 0.3.dev%{git_revno}%{?dist}
+Release: 0.5.dev%{git_revno}%{?dist}
Summary: Openstack Install Utility
Group: Applications/System
@@ -17,6 +17,10 @@ Source0: http://mmagr.fedorapeople.org/downloads/packstack/packstack-%{ve
Patch0: el7-prescript.patch
Patch1: enable-epel.patch
Patch2: epel-releasever.patch
+Patch3: disable-nagios.patch
+Patch4: qpid-conf.patch
+Patch5: el7-horizon.patch
+Patch6: el7-swift.patch
BuildArch: noarch
@@ -69,6 +73,10 @@ This package contains documentation files for Packstack.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -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 {} +
@@ -107,9 +115,12 @@ rm -fr %{buildroot}%{python_sitelib}/tests
# Install Puppet module
mkdir -p %{buildroot}/%{_datadir}/openstack-puppet/modules
-mv %{_builddir}/puppet/templates %{buildroot}/%{python_sitelib}/packstack/puppet/
cp -r %{_builddir}/puppet/modules/packstack %{buildroot}/%{_datadir}/openstack-puppet/modules/
+# Move Puppet manifest templates back to original place
+mkdir -p %{buildroot}/%{python_sitelib}/packstack/puppet
+mv %{_builddir}/puppet/templates %{buildroot}/%{python_sitelib}/packstack/puppet/
+
%if 0%{?with_doc}
mkdir -p %{buildroot}%{_mandir}/man1
install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
@@ -137,6 +148,9 @@ install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
# changelog --------------------------------------------------------------------
%changelog
+* Thu Mar 20 2014 Martin Mágr <mmagr at redhat.com> - 2014.1.1-0.5.dev1018
+- Added disable-nagios.patch, el7-horizon.patch, el7-swift.patch, qpid-conf.patch
+
* Tue Mar 04 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1.1-0.3.dev992
- auto enable epel as appropriate
diff --git a/qpid-conf.patch b/qpid-conf.patch
new file mode 100644
index 0000000..0918255
--- /dev/null
+++ b/qpid-conf.patch
@@ -0,0 +1,39 @@
+diff --git a/packstack/puppet/templates/amqp.pp b/packstack/puppet/templates/amqp.pp
+index 31c65d5..4150ee4 100644
+--- a/packstack/puppet/templates/amqp.pp
++++ b/packstack/puppet/templates/amqp.pp
+@@ -34,12 +34,30 @@ define enable_rabbitmq {
+ }
+
+ define enable_qpid($enable_ssl = 'n', $enable_auth = 'n') {
++ case $::operatingsystem {
++ 'Fedora': {
++ if (is_integer($::operatingsystemrelease) and $::operatingsystemrelease >= 20) or $::operatingsystemrelease == "Rawhide" {
++ $config = '/etc/qpid/qpidd.conf'
++ } else {
++ $config = '/etc/qpidd.conf'
++ }
++ }
++
++ 'RedHat': {
++ if $::operatingsystemmajrelease >= 7 {
++ $config = '/etc/qpid/qpidd.conf'
++ } else {
++ $config = '/etc/qpidd.conf'
++ }
++ }
++
++ default: {
++ $config = '/etc/qpidd.conf'
++ }
++ }
+
+ class {"qpid::server":
+- config_file => $::operatingsystem? {
+- 'Fedora' => '/etc/qpid/qpidd.conf',
+- default => '/etc/qpidd.conf',
+- },
++ config_file => $config,
+ auth => $enable_auth ? {
+ 'y' => 'yes',
+ default => 'no',
More information about the scm-commits
mailing list