Merge ~barryprice/charm-nrpe/+git/nrpe-charm:master into ~nrpe-charmers/charm-nrpe:master

[Barry Price]

Don't install recommends, to avoid installing rpcbind LP:1873171

Also fix a found unrelated bug in how we call nproc.

[Junien F (axino)]

+1000

review: Approve

[Tom Haddon (mthaddon)]

LGTM

review: Approve

[🤖 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)]

Change successfully merged at revision c5e33a0d0b946364ca77db45bab90e06429f1f71

diff --git a/hooks/nrpe_helpers.py b/hooks/nrpe_helpers.py
index e769c5a..b8cbca0 100644
--- a/hooks/nrpe_helpers.py
+++ b/hooks/nrpe_helpers.py
@@ -508,7 +508,7 @@ class SubordinateCheckDefinitions(dict):
 
     def proc_count(self):
         """ Return number number of processing units """
-        return int(subprocess.check_output('nproc --all'))
+        return int(subprocess.check_output(['nproc', '--all']))
 
     def parse_netlinks(self, ifaces):
         """Parses a list of strings, or a single string
diff --git a/hooks/nrpe_utils.py b/hooks/nrpe_utils.py
index 0fe733c..2c29459 100644
--- a/hooks/nrpe_utils.py
+++ b/hooks/nrpe_utils.py
@@ -45,7 +45,13 @@ def determine_packages():
 def install_packages(service_name):
     """ Install packages """
     fetch.apt_update()
-    fetch.apt_install(determine_packages(), fatal=True)
+    apt_options = [
+        # avoid installing rpcbind LP#1873171
+        '--no-install-recommends',
+        # and retain the default option too
+        '--option=Dpkg::Options::=--force-confold',
+    ]
+    fetch.apt_install(determine_packages(), options=apt_options, fatal=True)
 
 
 def remove_host_export_fragments(service_name):