Merge lp:~vern/charm-haproxy/fix-install-hook into lp:charm-haproxy

[Vern Hart]

Simplify install hook (works on bionic and focal).

Fixes: https://bugs.launchpad.net/charm-haproxy/+bug/1946798

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

[Vern Hart (vern)]

Note that I tested this on bionic and focal by deploying with --series:

  juju deploy ../../charms/haproxy haproxyb --bind oam-space --series bionic --to lxd:0
  juju deploy ../../charms/haproxy haproxyf --bind oam-space --series focal --to lxd:0

And verifying that the charms installed correctly.

[Tom Haddon (mthaddon)]

This is a nice simplification. Thanks.

review: Approve

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

Change successfully merged at revision 148

=== modified file 'hooks/install'
--- hooks/install	2021-10-13 14:16:58 +0000
+++ hooks/install	2021-10-13 15:17:05 +0000
@@ -2,25 +2,15 @@
 
 set -eu
 
-apt_get_install() {
-    DEBIAN_FRONTEND=noninteractive apt-get -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install $@
-}
-
 apt-get -y update
 
 juju-log 'Invoking charm-pre-install hooks'
 [ -d exec.d ] && ( for f in exec.d/*/charm-pre-install; do [ -x $f ] && /bin/sh -c "$f"; done )
 
-if dpkg --compare-versions "$(lsb_release -rs)" ge 20.04; then
-    # Install missing python-yaml and python-apt packages
-    apt-get install -y python2 python-yaml python-apt
-
-    juju-log 'Invoking python-based install hook'
-    python2 hooks/hooks.py install
-else
-    # Install missing python-yaml and python-apt packages
-    apt-get install -y python-yaml python-apt
-
-    juju-log 'Invoking python-based install hook'
-    python hooks/hooks.py install
-fi
+# Install missing python-yaml and python-apt packages
+# Note that these depend on python2 on focal and newer
+apt-get install -y python-yaml python-apt
+
+juju-log 'Invoking python-based install hook'
+# use python2 because python is 3 on focal or newer
+python2 hooks/hooks.py install