Merge "Fix deployment on pacemaker remote nodes"

deployment/containers-common.yaml

@@ -53,9 +53,17 @@ parameters:
                  a config change is detected and the resource is being restarted
     type: number
 
+  ContainerCli:
+    type: string
+    default: 'podman'
+    description: CLI tool used to manage containers.
+    constraints:
+      - allowed_values: ['docker', 'podman']
+
 conditions:
 
   internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
+  docker_enabled: {equals: [{get_param: ContainerCli}, 'docker']}
 
 outputs:
   container_config_scripts:
@@ -142,10 +150,13 @@ outputs:
       list_concat:
         - *volumes_base
         - - /var/lib/container-config-scripts/pacemaker_restart_bundle.sh:/pacemaker_restart_bundle.sh:ro
-          - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
           - /dev/shm:/dev/shm:rw
           # required for bootstrap_host_exec, facter
           - /etc/puppet:/etc/puppet:ro
+        - if:
+          - docker_enabled
+          - - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
+          - null
 
   container_puppet_apply_volumes:
     description: Common volumes needed to run the container_puppet_apply.sh from container_config_scripts