ichavero pushed to openstack-puppet-modules (f22). "Updated patches from f22-patches (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 28 23:23:18 UTC 2015
>From 336f60d7ea005faf42bd4a53efc7def068fbb59b Mon Sep 17 00:00:00 2001
From: Ivan Chavero <ichavero at redhat.com>
Date: Tue, 28 Apr 2015 17:16:21 -0600
Subject: Updated patches from f22-patches
- Add 0014-Added-ulimit-support-for-RabbitMQ-which-was-restrict.patch
- Add 0015-Fixes-for-file_limit.patch
- Add 0016-Add-file_limit-support-for-RedHat-platforms.patch
- Resolves: rhbz#1207848
diff --git a/0014-Added-ulimit-support-for-RabbitMQ-which-was-restrict.patch b/0014-Added-ulimit-support-for-RabbitMQ-which-was-restrict.patch
new file mode 100644
index 0000000..2d791fb
--- /dev/null
+++ b/0014-Added-ulimit-support-for-RabbitMQ-which-was-restrict.patch
@@ -0,0 +1,110 @@
+From a7fc603e5d3e1cb0a866d1c02f4ae56330e4e5b2 Mon Sep 17 00:00:00 2001
+From: Guilherme Blanco <guilhermeblanco at gmail.com>
+Date: Thu, 24 Jul 2014 14:42:38 -0400
+Subject: [PATCH] Added ulimit support for RabbitMQ which was restricted to
+ 4096 file descriptors.
+
+---
+ rabbitmq/manifests/config.pp | 13 +++++++++++--
+ rabbitmq/manifests/init.pp | 2 ++
+ rabbitmq/manifests/params.pp | 1 +
+ rabbitmq/templates/default.erb | 10 ++++++++++
+ rabbitmq/templates/limits.conf | 2 ++
+ rabbitmq/templates/rabbitmq-server.service.d/limits.conf | 2 ++
+ 6 files changed, 28 insertions(+), 2 deletions(-)
+ create mode 100644 rabbitmq/templates/default.erb
+ create mode 100644 rabbitmq/templates/limits.conf
+ create mode 100644 rabbitmq/templates/rabbitmq-server.service.d/limits.conf
+
+diff --git a/rabbitmq/manifests/config.pp b/rabbitmq/manifests/config.pp
+index 2795cd0..390b866 100644
+--- a/rabbitmq/manifests/config.pp
++++ b/rabbitmq/manifests/config.pp
+@@ -88,6 +88,17 @@ class rabbitmq::config {
+ }
+
+
++ if $::osfamily == 'Debian' {
++ file { '/etc/default/rabbitmq-server':
++ ensure => file,
++ content => template('rabbitmq/default.erb'),
++ mode => '0644',
++ owner => '0',
++ group => '0',
++ notify => Class['rabbitmq::service'],
++ }
++ }
++
+ if $config_cluster {
+
+ file { 'erlang_cookie':
+@@ -119,7 +130,5 @@ class rabbitmq::config {
+ }
+
+ }
+-
+-
+ }
+
+diff --git a/rabbitmq/manifests/init.pp b/rabbitmq/manifests/init.pp
+index aa42b81..29fe93d 100644
+--- a/rabbitmq/manifests/init.pp
++++ b/rabbitmq/manifests/init.pp
+@@ -50,6 +50,7 @@ class rabbitmq(
+ $version = $rabbitmq::params::version,
+ $wipe_db_on_cookie_change = $rabbitmq::params::wipe_db_on_cookie_change,
+ $cluster_partition_handling = $rabbitmq::params::cluster_partition_handling,
++ $file_limit = $rabbitmq::params::file_limit,
+ $environment_variables = $rabbitmq::params::environment_variables,
+ $config_variables = $rabbitmq::params::config_variables,
+ $config_kernel_variables = $rabbitmq::params::config_kernel_variables,
+@@ -86,6 +87,7 @@ class rabbitmq(
+ validate_re($stomp_port, '\d+')
+ validate_bool($wipe_db_on_cookie_change)
+ validate_bool($tcp_keepalive)
++ validate_re($file_limit, '\d+')
+ # Validate service parameters.
+ validate_re($service_ensure, '^(running|stopped)$')
+ validate_bool($service_manage)
+diff --git a/rabbitmq/manifests/params.pp b/rabbitmq/manifests/params.pp
+index b82ed87..76fbd0f 100644
+--- a/rabbitmq/manifests/params.pp
++++ b/rabbitmq/manifests/params.pp
+@@ -99,4 +99,5 @@ class rabbitmq::params {
+ $environment_variables = {}
+ $config_variables = {}
+ $config_kernel_variables = {}
++ $file_limit = 16384
+ }
+diff --git a/rabbitmq/templates/default.erb b/rabbitmq/templates/default.erb
+new file mode 100644
+index 0000000..a2bea95
+--- /dev/null
++++ b/rabbitmq/templates/default.erb
+@@ -0,0 +1,10 @@
++# File managed by Puppet.
++
++# This file is sourced by /etc/init.d/rabbitmq-server. Its primary
++# reason for existing is to allow adjustment of system limits for the
++# rabbitmq-server process.
++#
++# Maximum number of open file handles. This will need to be increased
++# to handle many simultaneous connections. Refer to the system
++# documentation for ulimit (in man bash) for more information.
++ulimit -n <%= @file_limit %>
+diff --git a/rabbitmq/templates/limits.conf b/rabbitmq/templates/limits.conf
+new file mode 100644
+index 0000000..bb017fd
+--- /dev/null
++++ b/rabbitmq/templates/limits.conf
+@@ -0,0 +1,2 @@
++rabbitmq soft nofile <%= @file_limit %>
++rabbitmq hard nofile <%= @file_limit %>
+diff --git a/rabbitmq/templates/rabbitmq-server.service.d/limits.conf b/rabbitmq/templates/rabbitmq-server.service.d/limits.conf
+new file mode 100644
+index 0000000..7877386
+--- /dev/null
++++ b/rabbitmq/templates/rabbitmq-server.service.d/limits.conf
+@@ -0,0 +1,2 @@
++[Service]
++LimitNOFILE=<%= @file_limit %>
diff --git a/0015-Fixes-for-file_limit.patch b/0015-Fixes-for-file_limit.patch
new file mode 100644
index 0000000..4bd4886
--- /dev/null
+++ b/0015-Fixes-for-file_limit.patch
@@ -0,0 +1,203 @@
+From 4c58321e79ee0c0497ed235bdb152da01f293786 Mon Sep 17 00:00:00 2001
+From: Morgan Haskel <morgan at puppetlabs.com>
+Date: Mon, 9 Mar 2015 17:18:14 -0700
+Subject: [PATCH] Fixes for file_limit
+
+There were no docs or tests, and the validation failed if an integer was
+passed
+---
+ rabbitmq/README.md | 6 +-
+ rabbitmq/manifests/init.pp | 4 +-
+ rabbitmq/spec/classes/rabbitmq_spec.rb | 140 ++++++++++++++++++++++++++++++++-
+ 3 files changed, 144 insertions(+), 6 deletions(-)
+
+diff --git a/rabbitmq/README.md b/rabbitmq/README.md
+index ebf8790..5ec016c 100644
+--- a/rabbitmq/README.md
++++ b/rabbitmq/README.md
+@@ -222,7 +222,11 @@ RabbitMQ Environment Variables in rabbitmq_env.config
+
+ The erlang cookie to use for clustering - must be the same between all nodes.
+
+-###`key_content`
++####`file_limit`
++
++Set rabbitmq file ulimit. Defaults to 16384. Only available on systems with `$::osfamily == 'Debian'`
++
++####`key_content`
+
+ Uses content method for Debian OS family. Should be a template for apt::source
+ class. Overrides `package_gpg_key` behavior, if enabled. Undefined by default.
+diff --git a/rabbitmq/manifests/init.pp b/rabbitmq/manifests/init.pp
+index 29fe93d..5cdd19d 100644
+--- a/rabbitmq/manifests/init.pp
++++ b/rabbitmq/manifests/init.pp
+@@ -87,7 +87,9 @@ class rabbitmq(
+ validate_re($stomp_port, '\d+')
+ validate_bool($wipe_db_on_cookie_change)
+ validate_bool($tcp_keepalive)
+- validate_re($file_limit, '\d+')
++ if ! is_integer($file_limit) {
++ validate_re($file_limit, '^(unlimited|infinity)$', '$file_limit must be an integer, \'unlimited\', or \'infinity\'.')
++ }
+ # Validate service parameters.
+ validate_re($service_ensure, '^(running|stopped)$')
+ validate_bool($service_manage)
+diff --git a/rabbitmq/spec/classes/rabbitmq_spec.rb b/rabbitmq/spec/classes/rabbitmq_spec.rb
+index e82a64e..59e60b3 100644
+--- a/rabbitmq/spec/classes/rabbitmq_spec.rb
++++ b/rabbitmq/spec/classes/rabbitmq_spec.rb
+@@ -30,8 +30,141 @@ describe 'rabbitmq' do
+ context 'on Debian' do
+ let(:params) {{ :manage_repos => false }}
+ let(:facts) {{ :osfamily => 'Debian', :lsbdistid => 'Debian', :lsbdistcodename => 'squeeze' }}
+- it 'does not include rabbitmq::repo::apt when manage_repos is false' do
+- should_not contain_class('rabbitmq::repo::apt')
++ it 'does ensure rabbitmq apt::source is absent when manage_repos is false' do
++ should_not contain_apt__source('rabbitmq')
++ end
++ end
++
++ context 'on Debian' do
++ let(:params) {{ :manage_repos => true }}
++ let(:facts) {{ :osfamily => 'Debian', :lsbdistid => 'Debian', :lsbdistcodename => 'squeeze' }}
++
++ it 'includes rabbitmq::repo::apt' do
++ should contain_class('rabbitmq::repo::apt')
++ end
++
++ describe 'apt::source default values' do
++ it 'should add a repo with defaults values' do
++ should contain_apt__source('rabbitmq').with( {
++ :ensure => 'present',
++ :location => 'http://www.rabbitmq.com/debian/',
++ :release => 'testing',
++ :repos => 'main',
++ })
++ end
++ end
++ end
++
++ context 'on Debian' do
++ let(:params) {{ :repos_ensure => false }}
++ let(:facts) {{ :osfamily => 'Debian', :lsbdistid => 'Debian', :lsbdistcodename => 'squeeze' }}
++ it 'does ensure rabbitmq apt::source is absent when repos_ensure is false' do
++ should contain_apt__source('rabbitmq').with(
++ 'ensure' => 'absent'
++ )
++ end
++ end
++
++ context 'on Debian' do
++ let(:params) {{ :repos_ensure => true }}
++ let(:facts) {{ :osfamily => 'Debian', :lsbdistid => 'Debian', :lsbdistcodename => 'squeeze' }}
++
++ it 'includes rabbitmq::repo::apt' do
++ should contain_class('rabbitmq::repo::apt')
++ end
++
++ describe 'apt::source default values' do
++ it 'should add a repo with defaults values' do
++ should contain_apt__source('rabbitmq').with( {
++ :ensure => 'present',
++ :location => 'http://www.rabbitmq.com/debian/',
++ :release => 'testing',
++ :repos => 'main',
++ })
++ end
++ end
++ end
++
++ context 'on Debian' do
++ let(:params) {{ :manage_repos => true, :repos_ensure => false }}
++ let(:facts) {{ :osfamily => 'Debian', :lsbdistid => 'Debian', :lsbdistcodename => 'squeeze' }}
++
++ it 'includes rabbitmq::repo::apt' do
++ should contain_class('rabbitmq::repo::apt')
++ end
++
++ describe 'apt::source default values' do
++ it 'should add a repo with defaults values' do
++ should contain_apt__source('rabbitmq').with( {
++ :ensure => 'absent',
++ })
++ end
++ end
++ end
++
++ context 'on Debian' do
++ let(:params) {{ :manage_repos => true, :repos_ensure => true }}
++ let(:facts) {{ :osfamily => 'Debian', :lsbdistid => 'Debian', :lsbdistcodename => 'squeeze' }}
++
++ it 'includes rabbitmq::repo::apt' do
++ should contain_class('rabbitmq::repo::apt')
++ end
++
++ describe 'apt::source default values' do
++ it 'should add a repo with defaults values' do
++ should contain_apt__source('rabbitmq').with( {
++ :ensure => 'present',
++ :location => 'http://www.rabbitmq.com/debian/',
++ :release => 'testing',
++ :repos => 'main',
++ })
++ end
++ end
++ end
++
++ context 'on Debian' do
++ let(:params) {{ :manage_repos => false, :repos_ensure => true }}
++ let(:facts) {{ :osfamily => 'Debian', :lsbdistid => 'Debian', :lsbdistcodename => 'squeeze' }}
++ it 'does ensure rabbitmq apt::source is absent when manage_repos is false and repos_ensure is true' do
++ should_not contain_apt__source('rabbitmq')
++ end
++ end
++
++ context 'on Debian' do
++ let(:facts) {{ :osfamily => 'Debian', :lsbdistid => 'Debian', :lsbdistcodename => 'squeeze' }}
++ context 'with manage_repos => false and repos_ensure => false' do
++ let(:params) {{ :manage_repos => false, :repos_ensure => false }}
++ it 'does ensure rabbitmq apt::source is absent when manage_repos is false and repos_ensure is false' do
++ should_not contain_apt__source('rabbitmq')
++ end
++ end
++
++ context 'with file_limit => unlimited' do
++ let(:params) {{ :file_limit => 'unlimited' }}
++ it { should contain_file('/etc/default/rabbitmq-server').with_content(/ulimit -n unlimited/) }
++ end
++
++ context 'with file_limit => infinity' do
++ let(:params) {{ :file_limit => 'infinity' }}
++ it { should contain_file('/etc/default/rabbitmq-server').with_content(/ulimit -n infinity/) }
++ end
++
++ context 'with file_limit => -1' do
++ let(:params) {{ :file_limit => -1 }}
++ it { should contain_file('/etc/default/rabbitmq-server').with_content(/ulimit -n -1/) }
++ end
++
++ context 'with file_limit => \'1234\'' do
++ let(:params) {{ :file_limit => '1234' }}
++ it { should contain_file('/etc/default/rabbitmq-server').with_content(/ulimit -n 1234/) }
++ end
++
++ context 'with file_limit => foo' do
++ let(:params) {{ :file_limit => 'foo' }}
++ it 'does not compile' do
++ expect{subject}.to raise_error(/\$file_limit must be an integer, 'unlimited', or 'infinity'/)
++ end
++>>>>>>> 4ec851b... Fixes for file_limit:spec/classes/rabbitmq_spec.rb
+ end
+ end
+
+@@ -63,8 +196,7 @@ describe 'rabbitmq' do
+ it { should contain_class('rabbitmq::config') }
+ it { should contain_class('rabbitmq::service') }
+
+-
+- context 'with admin_enable set to true' do
++ context 'with admin_enable set to true' do
+ let(:params) {{ :admin_enable => true }}
+ context 'with service_manage set to true' do
+ it 'we enable the admin interface by default' do
diff --git a/0016-Add-file_limit-support-for-RedHat-platforms.patch b/0016-Add-file_limit-support-for-RedHat-platforms.patch
new file mode 100644
index 0000000..5bf88c0
--- /dev/null
+++ b/0016-Add-file_limit-support-for-RedHat-platforms.patch
@@ -0,0 +1,238 @@
+From fd5d65a65620f8b1106e95f47af3c6b9ba4d7468 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Charlier?= <francois.charlier at redhat.com>
+Date: Mon, 13 Apr 2015 21:01:25 +0200
+Subject: [PATCH] Add file_limit support for RedHat platforms
+
+---
+ rabbitmq/README.md | 6 ++
+ rabbitmq/manifests/config.pp | 50 ++++++++++--
+ rabbitmq/spec/classes/rabbitmq_spec.rb | 138 +++++++++++++++++++++++++++++++++
+ 3 files changed, 186 insertions(+), 8 deletions(-)
+
+diff --git a/rabbitmq/README.md b/rabbitmq/README.md
+index 5ec016c..119dbe2 100644
+--- a/rabbitmq/README.md
++++ b/rabbitmq/README.md
+@@ -221,6 +221,12 @@ RabbitMQ Environment Variables in rabbitmq_env.config
+ ####`erlang_cookie`
+
+ The erlang cookie to use for clustering - must be the same between all nodes.
++This value has no default and must be set explicitly if using clustering.
++
++####`file_limit`
++
++Set rabbitmq file ulimit. Defaults to 16384. Only available on systems with
++`$::osfamily == 'Debian'` or `$::osfamily == 'RedHat'`.
+
+ ####`file_limit`
+
+diff --git a/rabbitmq/manifests/config.pp b/rabbitmq/manifests/config.pp
+index 390b866..9dc98dc 100644
+--- a/rabbitmq/manifests/config.pp
++++ b/rabbitmq/manifests/config.pp
+@@ -88,14 +88,48 @@ class rabbitmq::config {
+ }
+
+
+- if $::osfamily == 'Debian' {
+- file { '/etc/default/rabbitmq-server':
+- ensure => file,
+- content => template('rabbitmq/default.erb'),
+- mode => '0644',
+- owner => '0',
+- group => '0',
+- notify => Class['rabbitmq::service'],
++ case $::osfamily {
++ 'Debian': {
++ file { '/etc/default/rabbitmq-server':
++ ensure => file,
++ content => template('rabbitmq/default.erb'),
++ mode => '0644',
++ owner => '0',
++ group => '0',
++ notify => Class['rabbitmq::service'],
++ }
++ }
++ 'RedHat': {
++ if versioncmp($::operatingsystemmajrelease, '7') >= 0 {
++ file { '/etc/systemd/system/rabbitmq-server.service.d':
++ ensure => directory,
++ owner => '0',
++ group => '0',
++ mode => '0755',
++ } ->
++ file { '/etc/systemd/system/rabbitmq-server.service.d/limits.conf':
++ content => template('rabbitmq/rabbitmq-server.service.d/limits.conf'),
++ owner => '0',
++ group => '0',
++ mode => '0644',
++ notify => Exec['rabbitmq-systemd-reload'],
++ }
++ exec { 'rabbitmq-systemd-reload':
++ command => '/usr/bin/systemctl daemon-reload',
++ notify => Class['Rabbitmq::Service'],
++ refreshonly => true,
++ }
++ } else {
++ file { '/etc/security/limits.d/rabbitmq-server.conf':
++ content => template('rabbitmq/limits.conf'),
++ owner => '0',
++ group => '0',
++ mode => '0644',
++ notify => Class['Rabbitmq::Service'],
++ }
++ }
++ }
++ default: {
+ }
+ }
+
+diff --git a/rabbitmq/spec/classes/rabbitmq_spec.rb b/rabbitmq/spec/classes/rabbitmq_spec.rb
+index 59e60b3..c1e4ccd 100644
+--- a/rabbitmq/spec/classes/rabbitmq_spec.rb
++++ b/rabbitmq/spec/classes/rabbitmq_spec.rb
+@@ -183,6 +183,144 @@ describe 'rabbitmq' do
+ end
+ end
+
++ context 'on RedHat 7.0 or more' do
++ let(:facts) {{ :osfamily => 'RedHat', :operatingsystemmajrelease => '7' }}
++
++ it { should contain_file('/etc/systemd/system/rabbitmq-server.service.d').with(
++ 'ensure' => 'directory',
++ 'owner' => '0',
++ 'group' => '0',
++ 'mode' => '0755'
++ ) }
++
++ it { should contain_exec('rabbitmq-systemd-reload').with(
++ 'command' => '/usr/bin/systemctl daemon-reload',
++ 'notify' => 'Class[Rabbitmq::Service]',
++ 'refreshonly' => true
++ ) }
++ context 'with file_limit => unlimited' do
++ let(:params) {{ :file_limit => 'unlimited' }}
++ it { should contain_file('/etc/systemd/system/rabbitmq-server.service.d/limits.conf').with(
++ 'owner' => '0',
++ 'group' => '0',
++ 'mode' => '0644',
++ 'notify' => 'Exec[rabbitmq-systemd-reload]',
++ 'content' => '[Service]
++LimitNOFILE=unlimited
++'
++ ) }
++ end
++
++ context 'with file_limit => infinity' do
++ let(:params) {{ :file_limit => 'infinity' }}
++ it { should contain_file('/etc/systemd/system/rabbitmq-server.service.d/limits.conf').with(
++ 'owner' => '0',
++ 'group' => '0',
++ 'mode' => '0644',
++ 'notify' => 'Exec[rabbitmq-systemd-reload]',
++ 'content' => '[Service]
++LimitNOFILE=infinity
++'
++ ) }
++ end
++
++ context 'with file_limit => -1' do
++ let(:params) {{ :file_limit => -1 }}
++ it { should contain_file('/etc/systemd/system/rabbitmq-server.service.d/limits.conf').with(
++ 'owner' => '0',
++ 'group' => '0',
++ 'mode' => '0644',
++ 'notify' => 'Exec[rabbitmq-systemd-reload]',
++ 'content' => '[Service]
++LimitNOFILE=-1
++'
++ ) }
++ end
++
++ context 'with file_limit => \'1234\'' do
++ let(:params) {{ :file_limit => '1234' }}
++ it { should contain_file('/etc/systemd/system/rabbitmq-server.service.d/limits.conf').with(
++ 'owner' => '0',
++ 'group' => '0',
++ 'mode' => '0644',
++ 'notify' => 'Exec[rabbitmq-systemd-reload]',
++ 'content' => '[Service]
++LimitNOFILE=1234
++'
++ ) }
++ end
++
++ context 'with file_limit => foo' do
++ let(:params) {{ :file_limit => 'foo' }}
++ it 'does not compile' do
++ expect { catalogue }.to raise_error(Puppet::Error, /\$file_limit must be an integer, 'unlimited', or 'infinity'/)
++ end
++ end
++ end
++
++ context 'on RedHat before 7.0' do
++ let(:facts) {{ :osfamily => 'RedHat', :operatingsystemmajrelease => '6' }}
++
++ context 'with file_limit => unlimited' do
++ let(:params) {{ :file_limit => 'unlimited' }}
++ it { should contain_file('/etc/security/limits.d/rabbitmq-server.conf').with(
++ 'owner' => '0',
++ 'group' => '0',
++ 'mode' => '0644',
++ 'notify' => 'Class[Rabbitmq::Service]',
++ 'content' => 'rabbitmq soft nofile unlimited
++rabbitmq hard nofile unlimited
++'
++ ) }
++ end
++
++ context 'with file_limit => infinity' do
++ let(:params) {{ :file_limit => 'infinity' }}
++ it { should contain_file('/etc/security/limits.d/rabbitmq-server.conf').with(
++ 'owner' => '0',
++ 'group' => '0',
++ 'mode' => '0644',
++ 'notify' => 'Class[Rabbitmq::Service]',
++ 'content' => 'rabbitmq soft nofile infinity
++rabbitmq hard nofile infinity
++'
++ ) }
++ end
++
++ context 'with file_limit => -1' do
++ let(:params) {{ :file_limit => -1 }}
++ it { should contain_file('/etc/security/limits.d/rabbitmq-server.conf').with(
++ 'owner' => '0',
++ 'group' => '0',
++ 'mode' => '0644',
++ 'notify' => 'Class[Rabbitmq::Service]',
++ 'content' => 'rabbitmq soft nofile -1
++rabbitmq hard nofile -1
++'
++ ) }
++ end
++
++ context 'with file_limit => \'1234\'' do
++ let(:params) {{ :file_limit => '1234' }}
++ it { should contain_file('/etc/security/limits.d/rabbitmq-server.conf').with(
++ 'owner' => '0',
++ 'group' => '0',
++ 'mode' => '0644',
++ 'notify' => 'Class[Rabbitmq::Service]',
++ 'content' => 'rabbitmq soft nofile 1234
++rabbitmq hard nofile 1234
++'
++ ) }
++ end
++
++ context 'with file_limit => foo' do
++ let(:params) {{ :file_limit => 'foo' }}
++ it 'does not compile' do
++ expect { catalogue }.to raise_error(Puppet::Error, /\$file_limit must be an integer, 'unlimited', or 'infinity'/)
++ end
++ end
++ end
++
+ ['Debian', 'RedHat', 'SUSE', 'Archlinux'].each do |distro|
+ context "on #{distro}" do
+ let(:facts) {{
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index 401a28c..5dbbcdc 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -22,6 +22,9 @@ Patch0010: 0010-Configure-OVS-mechanism-agent-configs-in-its-config-.patch
Patch0011: 0011-Fix-rabbitmq-support.patch
Patch0012: 0012-Changing-the-default-value-of-fastpath_flood-to-enab.patch
Patch0013: 0013-move-setting-of-novncproxy_base_url.patch
+Patch0014: 0014-Added-ulimit-support-for-RabbitMQ-which-was-restrict.patch
+Patch0015: 0015-Fixes-for-file_limit.patch
+Patch0016: 0016-Add-file_limit-support-for-RedHat-platforms.patch
BuildArch: noarch
Requires: rubygem-json
@@ -47,6 +50,9 @@ OpenStack via installers using Puppet configuration tool.
%patch0011 -p1
%patch0012 -p1
%patch0013 -p1
+%patch0014 -p1
+%patch0015 -p1
+%patch0016 -p1
find %{_builddir}/%{name}-%{version}/ -type f -name ".*" -exec rm {} +
find %{_builddir}/%{name}-%{version}/ -size 0 -exec rm {} +
@@ -120,6 +126,12 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
%changelog
+* Tue Apr 28 2015 Ivan Chavero <ichavero at redhat.com> 2014.2.15-2
+- Add 0014-Added-ulimit-support-for-RabbitMQ-which-was-restrict.patch
+- Add 0015-Fixes-for-file_limit.patch
+- Add 0016-Add-file_limit-support-for-RedHat-platforms.patch
+- Resolves: rhbz#1207848
+
* Wed Apr 15 2015 Ivan Chavero <ichavero at redhat.com> 2014.2.15-1
- Update to upstream 2014.2.15
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/openstack-puppet-modules.git/commit/?h=f22&id=336f60d7ea005faf42bd4a53efc7def068fbb59b
More information about the scm-commits
mailing list