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

[Edward Hope-Morley]

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

charm_lint_check #2966 nova-cloud-controller-next for hopem mp254518
    LINT OK: passed

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

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

charm_unit_test #2757 nova-cloud-controller-next for hopem mp254518
    UNIT OK: passed

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

[lp:~hopem/charms/trusty/nova-cloud-controller/ensure-apache-restart]

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

use service_reload()

[Billy Olsen (billy-olsen)]

LGTM, Approved

review: Approve

=== modified file 'hooks/nova_cc_hooks.py'
--- hooks/nova_cc_hooks.py	2015-02-19 04:29:22 +0000
+++ hooks/nova_cc_hooks.py	2015-03-30 17:26:57 +0000
@@ -5,7 +5,10 @@
 import sys
 import uuid
 
-from subprocess import check_call
+from subprocess import (
+    check_call,
+)
+
 from urlparse import urlparse
 
 from charmhelpers.core.hookenv import (
@@ -29,6 +32,7 @@
     restart_on_change,
     service_running,
     service_stop,
+    service_reload,
     service_restart,
 )
 
@@ -744,6 +748,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_nova_cc_hooks.py'
--- unit_tests/test_nova_cc_hooks.py	2015-01-13 14:44:54 +0000
+++ unit_tests/test_nova_cc_hooks.py	2015-03-30 17:26:57 +0000
@@ -49,6 +49,7 @@
     'ssh_known_hosts_lines',
     'ssh_authorized_keys_lines',
     'save_script_rc',
+    'service_reload',
     'service_restart',
     'service_running',
     'service_stop',