Merge ~hloeung/charm-nrpe:master into ~nrpe-charmers/charm-nrpe:master

[Haw Loeung]

Export nagios definitions if nagios_master set - LP#1830159

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

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

[Paul Collins (pjdc)]

review: Approve (lgtm)

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

Change successfully merged at revision 8cecde43d69d86ed6399737ad608e9bad79305b1

diff --git a/.gitignore b/.gitignore
index 4dcb392..0dce009 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 *.pyc
 __pycache__/
 .venv/
+builds/
diff --git a/hooks/nrpe_helpers.py b/hooks/nrpe_helpers.py
index c3adc6e..abd6398 100644
--- a/hooks/nrpe_helpers.py
+++ b/hooks/nrpe_helpers.py
@@ -273,6 +273,8 @@ class RsyncEnabled(helpers.RelationContext):
     def __init__(self):
         self['export_nagios_definitions'] = \
             hookenv.config('export_nagios_definitions')
+        if hookenv.config('nagios_master') and hookenv.config('nagios_master') != 'None':
+            self['export_nagios_definitions'] = True
 
     def is_ready(self):
         return self['export_nagios_definitions']
diff --git a/hooks/nrpe_utils.py b/hooks/nrpe_utils.py
index c6342d1..6e2e9ab 100644
--- a/hooks/nrpe_utils.py
+++ b/hooks/nrpe_utils.py
@@ -35,6 +35,8 @@ def determine_packages():
     ]
     if hookenv.config('export_nagios_definitions'):
         pkgs.append('rsync')
+    if hookenv.config('nagios_master') and hookenv.config('nagios_master') != 'None':
+        pkgs.append('rsync')
     return pkgs
 
 
@@ -163,7 +165,7 @@ class TolerantPortManagerCallback(PortManagerCallback):
     for opening ports
 
     For context, see:
-    https://bugs.launchpad.net/juju/+bug/1750079 and 
+    https://bugs.launchpad.net/juju/+bug/1750079 and
     https://github.com/juju/charm-helpers/pull/152
     """
     def __call__(self, manager, service_name, event_name):