Merge ~gschiano/squid-reverseproxy-charm:fix-binary-path-issue into squid-reverseproxy-charm:master

[Grégory Schiano]

Fix issue with squid binary on 22.04

On 22.04 the binary is /usr/sbin/squid while the charm didn't customize it based on charm host version

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

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

[Haw Loeung (hloeung)]

LGTM

review: Approve (+1)

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

Change successfully merged at revision 78b2ec226e39b664e2781b5f93212c9d1ae15846

diff --git a/hooks/hooks.py b/hooks/hooks.py
index 87fa850..3aad58c 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -1,34 +1,33 @@
 #!/usr/bin/env python3
 
+import collections
 import math
 import os
 import random
 import re
 import shutil
+import socket
 import string
 import subprocess
 import sys
-import yaml
-import collections
-import socket
-import apt_pkg
 
+import apt_pkg
+import yaml
+from charmhelpers.contrib.charmsupport.nrpe import NRPE
+from charmhelpers.core import host
+from charmhelpers.core.hookenv import close_port
+from charmhelpers.core.hookenv import config as config_get
 from charmhelpers.core.hookenv import (
-    config as config_get,
     is_relation_made,
+    local_unit,
     log,
-    relation_set,
-    relation_get,
-    relation_ids as get_relation_ids,
-    relations_of_type,
-    related_units,
     open_port,
-    close_port,
-    local_unit,
+    related_units,
+    relation_get,
 )
+from charmhelpers.core.hookenv import relation_ids as get_relation_ids
+from charmhelpers.core.hookenv import relation_set, relations_of_type
 from charmhelpers.fetch import apt_install
-from charmhelpers.contrib.charmsupport.nrpe import NRPE
-from charmhelpers.core import host
 
 ###############################################################################
 # Global variables
@@ -45,6 +44,7 @@ default_squid3_config = "%s/squid.conf" % default_squid3_config_dir
 default_squid3_config_cache_dir = "/var/run/{}".format(squid_name)
 default_squid3_cache_dir = "/var/spool/{}".format(squid_name)
 default_nagios_plugin_dir = "/usr/lib/nagios/plugins"
+default_squid3_binary = "/usr/sbin/{}".format(squid_name)
 access_log_path = "/var/log/{}/access.log".format(squid_name)
 metrics_cronjob_path = "/etc/cron.d/squid_metrics"
 metrics_script_path = "/usr/local/bin/squid_metrics.py"
@@ -455,7 +455,7 @@ def service_squid3(action=None, squid3_config=default_squid3_config):
     if action is None or squid3_config is None:
         return
     elif action == "check":
-        check_cmd = ['/usr/sbin/squid3', '-f', squid3_config, '-k', 'parse']
+        check_cmd = [default_squid3_binary, '-f', squid3_config, '-k', 'parse']
         return not subprocess.call(check_cmd)
     elif action in ('start', 'stop', 'reload', 'restart', 'status'):
         return host.service(action, service_name)