T6686: adds explicit disable option

Author: nvollmar

interface-definitions/container.xml.in

@@ -561,6 +561,12 @@
               <help>Configure health check for the container</help>
             </properties>
             <children>
+              <leafNode name="disable">
+                <properties>
+                  <help>Disable health check if container has one defined</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
               <leafNode name="command">
                 <properties>
                   <help>Health check command to run for the container</help>

smoketest/scripts/cli/test_container.py

@@ -83,6 +83,7 @@ def test_basic(self):
 
         self.cli_set(base_path + ['name', cont_name, 'image', busybox_image])
         self.cli_set(base_path + ['name', cont_name, 'allow-host-networks'])
+        self.cli_set(base_path + ['name', cont_name, 'health-check', 'disable'])
         self.cli_set(
             base_path
             + [
@@ -112,7 +113,7 @@ def test_basic(self):
 
         l = cmd_to_json(f'sudo podman container inspect {cont_name}')
         self.assertEqual(l['HostConfig']['LogConfig']['Type'], 'journald')
-        self.assertEqual(l['Config']['Healthcheck']['Test'], ['NONE'])
+        self.assertIsNone(l['Config'].get('Healthcheck'))
 
     def test_healthcheck(self):
         cont_name = 'health-test'

src/conf_mode/container.py

@@ -476,8 +476,8 @@ def generate_run_arguments(name, container_config, host_ident):
         if 'retries' in container_config['health_check']:
             health_rt = container_config['health_check']['retries']
             healthcheck += f' --health-retries={health_rt}'
-    else:
-        healthcheck = ' --no-healthcheck'
+        if 'disable' in container_config['health_check']:
+            healthcheck = f'  --no-healthcheck'
 
     command = ''
     if 'command' in container_config: