Merge ~hloeung/content-cache-charm:nginx-config into content-cache-charm:master

[Haw Loeung]

Fixed where initial install hook fails because Nginx listens to TCP/80 by default

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

[John Losito (jlosito)]

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 85c6c683af73c31c16c75dfcabe41acc07e538b3

diff --git a/reactive/content_cache.py b/reactive/content_cache.py
index b778711..558275f 100644
--- a/reactive/content_cache.py
+++ b/reactive/content_cache.py
@@ -83,7 +83,9 @@ def service_start_or_reload():
     time.sleep(rnd)
 
     for name in services:
-        if reactive.is_flag_set('content_cache.{}.restart-required'.format(name)):
+        if reactive.is_flag_set('content_cache.{}.configured'.format(name)) and reactive.is_flag_set(
+            'content_cache.{}.restart-required'.format(name)
+        ):
             status.maintenance('Reloading {}...'.format(name))
             host.service_reload(name)
             reactive.clear_flag('content_cache.{}.restart-required'.format(name))
@@ -115,6 +117,16 @@ def configure_nginx_metrics(ngx_conf, enable_prometheus_metrics):
     return changed
 
 
[e-mail]_not('content_cache.nginx.installed')
+def stop_nginx():
+    # Just by installing the Nginx package, it has a default site configured
+    # and listens on TCP/80. This causes HAProxy to fail until such time as
+    # Nginx is configured and reloaded. We'll just stop it here.
+    host.service_stop('nginx')
+    reactive.set_flag('content_cache.nginx.installed')
+
+
[e-mail]('content_cache.nginx.installed')
 @reactive.when_not('content_cache.nginx.configured')
 def configure_nginx(conf_path=None):
     status.maintenance('setting up Nginx as caching layer')
diff --git a/tests/unit/test_content_cache.py b/tests/unit/test_content_cache.py
index 623b091..9e1de72 100644
--- a/tests/unit/test_content_cache.py
+++ b/tests/unit/test_content_cache.py
@@ -141,6 +141,13 @@ class TestCharm(unittest.TestCase):
         service_start.assert_called_with('nginx')
         service_reload.assert_not_called()
 
+    @mock.patch('charms.reactive.set_flag')
+    @mock.patch('charmhelpers.core.host.service_stop')
+    def test_stop_nginx(self, service_stop, set_flag):
+        content_cache.stop_nginx()
+        service_stop.assert_called_with('nginx')
+        set_flag.assert_called_once_with('content_cache.nginx.installed')
+
     @mock.patch('charms.reactive.clear_flag')
     @mock.patch('reactive.content_cache.update_logrotate')
     def test_configure_nginx_no_sites(self, logrotation, clear_flag):