Merge lp:~hopem/charms/trusty/cinder/ensure-apache-restart into lp:~openstack-charmers-archive/charms/trusty/cinder/next

[Edward Hope-Morley]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2962 cinder-next for hopem mp254515
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2962/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #2753 cinder-next for hopem mp254515
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/2753/

[lp:~hopem/charms/trusty/cinder/ensure-apache-restart]

82. By Edward Hope-Morley on 2015-03-30

use service_reload()

[Billy Olsen (billy-olsen)]

LGTM, Approved

review: Approve

=== modified file 'hooks/cinder_hooks.py'
--- hooks/cinder_hooks.py	2015-03-24 13:47:40 +0000
+++ hooks/cinder_hooks.py	2015-03-30 17:26:46 +0000
@@ -3,7 +3,9 @@
 import sys
 import uuid
 
-from subprocess import check_call
+from subprocess import (
+    check_call,
+)
 
 from cinder_utils import (
     determine_packages,
@@ -47,6 +49,7 @@
 from charmhelpers.core.host import (
     lsb_release,
     restart_on_change,
+    service_reload,
 )
 
 from charmhelpers.contrib.openstack.utils import (
@@ -460,6 +463,10 @@
         cmd = ['a2dissite', 'openstack_https_frontend']
         check_call(cmd)
 
+    # TODO: improve this by checking if local CN certs are available
+    # first then checking reload status (see LP #1433114).
+    service_reload('apache2', restart_on_failure=True)
+
     for rid in relation_ids('identity-service'):
         identity_joined(rid=rid)
 

=== modified file 'unit_tests/test_cinder_hooks.py'
--- unit_tests/test_cinder_hooks.py	2015-03-25 08:40:21 +0000
+++ unit_tests/test_cinder_hooks.py	2015-03-30 17:26:46 +0000
@@ -59,6 +59,7 @@
     # charmhelpers.core.host
     'apt_install',
     'apt_update',
+    'service_reload',
     # charmhelpers.contrib.openstack.openstack_utils
     'configure_installation_source',
     'openstack_upgrade_available',
@@ -234,8 +235,9 @@
         self.CONFIGS.complete_contexts.return_value = ['https']
         self.relation_ids.return_value = ['identity-service:0']
         hooks.configure_https()
-        cmd = ['a2ensite', 'openstack_https_frontend']
-        self.check_call.assert_called_with(cmd)
+        calls = [call('a2dissite', 'openstack_https_frontend'),
+                 call('service', 'apache2', 'reload')]
+        self.check_call.assert_called_has_calls(calls)
         identity_joined.assert_called_with(rid='identity-service:0')
 
     @patch.object(hooks, 'identity_joined')
@@ -244,8 +246,9 @@
         self.CONFIGS.complete_contexts.return_value = []
         self.relation_ids.return_value = ['identity-service:0']
         hooks.configure_https()
-        cmd = ['a2dissite', 'openstack_https_frontend']
-        self.check_call.assert_called_with(cmd)
+        calls = [call('a2dissite', 'openstack_https_frontend'),
+                 call('service', 'apache2', 'reload')]
+        self.check_call.assert_called_has_calls(calls)
         identity_joined.assert_called_with(rid='identity-service:0')
 
     def test_image_service_changed(self):