Merge branches 'w/2.9/improvement/backport-prechecks' and 'q/3153/2.8…

…/improvement/backport-prechecks' into tmp/octopus/q/2.9

CHANGELOG.md

@@ -35,29 +35,13 @@
   reducing disk space used by the ISO and in image caches
   (PR [#3047](https://github.com/scality/metalk8s/pull/3047))
 
-- [#2992](https://github.com/scality/metalk8s/issues/2992) - Check for conflicting
-  packages already installed on the machine before doing all the installation
-  (PR [#3050](https://github.com/scality/metalk8s/pull/3050))
-
 - [#2932](https://github.com/scality/metalk8s/issues/2932) - Add system partitions tab in
   MetalK8s UI node page
   (PR [#3045](https://github.com/scality/metalk8s/pull/3045))
 
-- Improve error handling when providing invalid CA minion in Bootstrap
-  configuration file
-  (PR [#3065](https://github.com/scality/metalk8s/pull/3065))
-
 - [#2925](https://github.com/scality/metalk8s/issues/2925) - Compare node metrics with average from MetalK8s UI
   (PR [#3078](https://github.com/scality/metalk8s/pull/3078))
 
-- [#3067](https://github.com/scality/metalk8s/issues/3067) - Check for conflicting
-  services already started on the machine before doing all the installation
-  (PR [#3069](https://github.com/scality/metalk8s/pull/3069))
-
-- [kubernetes/kubernetes#57534](https://github.com/kubernetes/kubernetes/issues/57534) -
-  Check if a route exists for the Service IPs CIDR
-  (PR [#3076](https://github.com/scality/metalk8s/pull/3076))
-
 - Improve the upgrade robustness when the platform is a bit slow
   (PR [#3105](https://github.com/scality/metalk8s/pull/3105))
 
@@ -74,15 +58,39 @@
   container can start at reboot even if local salt-minion is down
   (PR [#3041](https://github.com/scality/metalk8s/pull/3041))
 
-- Do not install `containerd.io` instead of `containerd` and `runc` when this
-  package is available in one configured repository
-  (PR [#3050](https://github.com/scality/metalk8s/pull/3050))
-
 - [#3075](https://github.com/scality/metalk8s/issues/3075) - Properly install "base"
   Salt dependencies from "base" RHEL 7 repository
   (PR [#3083](https://github.com/scality/metalk8s/pull/3083))
 
 ## Release 2.7.3 (in development)
+### Enhancements
+- [#2992](https://github.com/scality/metalk8s/issues/2992) - Check for conflicting
+  packages (`docker`, `docker-ce` and `containerd.io`) on target machines before
+  installation (bootstrap or expansion)
+  (PR [#3153](https://github.com/scality/metalk8s/pull/3153), backport of
+  PR [#3050](https://github.com/scality/metalk8s/pull/3050))
+
+- [#3067](https://github.com/scality/metalk8s/issues/3067) - Check for conflicting
+  services (`firewalld`) already started or enabled on target machines before
+  installation (bootstrap or expansion)
+  (PR [#3153](https://github.com/scality/metalk8s/pull/3153), backport of
+  PR [#3069](https://github.com/scality/metalk8s/pull/3069))
+
+- Improve error handling when providing invalid CA minion in Bootstrap
+  configuration file
+  (PR [#3153](https://github.com/scality/metalk8s/pull/3153), backport of
+  PR [#3065](https://github.com/scality/metalk8s/pull/3065))
+
+- [kubernetes/kubernetes#57534](https://github.com/kubernetes/kubernetes/issues/57534) -
+  Check if a route exists for the Service IPs CIDR
+  (PR [#3153](https://github.com/scality/metalk8s/pull/3153), backport of
+  PR [#3076](https://github.com/scality/metalk8s/pull/3076))
+
+### Bug fixes
+- Do not install `containerd.io` instead of `containerd` and `runc` when this
+  package is available in one configured repository
+  (PR [#3153](https://github.com/scality/metalk8s/pull/3153), backport of
+  PR [#3050](https://github.com/scality/metalk8s/pull/3050))
 
 ### Security fixes
 - Due to vulnerabilities (