openstack
/
charm-ceilometer
Code Issues Proposed changes

Stop/Start ceilometer-api if Apache has changed 

If the charm enables https then apache is used to terminate ssl. As
part of this Apache listens on the port that the ceilometer API port
was listening on and the API service shuffles down to a lower port. If
the services are restarted one at a time and Apache goes first then
Apache will try and bind to the port the API service is listening on
because the API service has not yet been restarted to pick up its
new port.

Change-Id: Ied3224660948a9775c8000369cba0c287944cde5
Closes-Bug: 1632287
This commit is contained in:
Liam Young 2016-10-11 10:59:19 +00:00
parent f38c27421b
commit f289429ed6
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ceilometer_utils.py
View File

@ -125,11 +125,14 @@ CONFIG_FILES = OrderedDict([
}),
(HTTPS_APACHE_CONF, {
'hook_contexts': [ApacheSSLContext()],
'services': ['apache2'],
# Include ceilometer-api to fix Bug #1632287 This is a temporary
# tactival fix as the charm will be rewritten to use mod_wsgi next
# cycle
'services': ['ceilometer-api', 'apache2'],
}),
(HTTPS_APACHE_24_CONF, {
'hook_contexts': [ApacheSSLContext()],
'services': ['apache2'],
'services': ['ceilometer-api', 'apache2'],
})
])

8
unit_tests/test_ceilometer_utils.py
View File

@ -110,9 +110,9 @@ class CeilometerUtilsTest(CharmTestCase):
'ceilometer-api'],
'/etc/haproxy/haproxy.cfg': ['haproxy'],
"/etc/apache2/sites-available/openstack_https_frontend": [
'apache2'],
'ceilometer-api', 'apache2'],
"/etc/apache2/sites-available/openstack_https_frontend.conf": [
'apache2']
'ceilometer-api', 'apache2']
}
)
@ -131,9 +131,9 @@ class CeilometerUtilsTest(CharmTestCase):
'ceilometer-api'],
'/etc/haproxy/haproxy.cfg': ['haproxy'],
"/etc/apache2/sites-available/openstack_https_frontend": [
'apache2'],
'ceilometer-api', 'apache2'],
"/etc/apache2/sites-available/openstack_https_frontend.conf": [
'apache2']
'ceilometer-api', 'apache2']
}
)