openstack
/
fuel-library
Code Issues Proposed changes

Add workaround for apache restart during deployment 

As figured out in the following launcpad bug
https://bugs.launchpad.net/fuel/+bug/1493353
Apache2 is not very friendly to any types of
restarts. This may lead to the issue when we
restart apache to often during deployment and
it gets into Byzantine unresponsive state
along with keystone which breaks keystone
providers operations.

Change-Id: I11c52089e9598fc6d088c3478c90de3aa853652a
Closes-bug: #1493372
Related-bug: #1493353
This commit is contained in:
Vladimir Kuklin 2015-09-10 23:44:48 +03:00
parent 71a6f83a50
commit d4723a87be
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/tweaks/manifests/apache_wrappers.pp
View File

@ -12,7 +12,7 @@ class tweaks::apache_wrappers (
# as we have found that sometimes with mod_wsgi apache will crash on a
# graceful restart - https://github.com/GrahamDumpleton/mod_wsgi/issues/81
Service <| name == $service_name or title == $service_name |> {
restart => 'apachectl graceful || apachectl restart',
restart => 'sleep 30 && apachectl graceful || apachectl restart',
hasrestart => true,
}
}

2
tests/noop/spec/hosts/api-proxy/api-proxy_spec.rb
View File

@ -7,7 +7,7 @@ describe manifest do
it {
should contain_service('httpd').with(
'hasrestart' => true,
'restart' => 'apachectl graceful || apachectl restart'
'restart' => 'sleep 30 && apachectl graceful || apachectl restart'
)
}
end

2
tests/noop/spec/hosts/astute/service_token_off_spec.rb
View File

@ -20,7 +20,7 @@ describe manifest do
:ensure => 'running',
:name => service_name,
:hasrestart => 'true',
:restart => 'apachectl graceful || apachectl restart'
:restart => 'sleep 30 && apachectl graceful || apachectl restart'
)
end

2
tests/noop/spec/hosts/ceph/radosgw_spec.rb
View File

@ -18,7 +18,7 @@ describe manifest do
it {
should contain_service('httpd').with(
'hasrestart' => true,
'restart' => 'apachectl graceful || apachectl restart',
'restart' => 'sleep 30 && apachectl graceful || apachectl restart',
)
}

2
tests/noop/spec/hosts/horizon/horizon_spec.rb
View File

@ -45,7 +45,7 @@ describe manifest do
it {
should contain_service('httpd').with(
'hasrestart' => true,
'restart' => 'apachectl graceful || apachectl restart'
'restart' => 'sleep 30 && apachectl graceful || apachectl restart'
)
}

2
tests/noop/spec/hosts/keystone/keystone_spec.rb
View File

@ -159,7 +159,7 @@ describe manifest do
it {
should contain_service('httpd').with(
'hasrestart' => true,
'restart' => 'apachectl graceful || apachectl restart'
'restart' => 'sleep 30 && apachectl graceful || apachectl restart'
)
}