Merge "Pass the container backend explicitely"

docker/services/pacemaker/cinder-backup.yaml

@@ -57,6 +57,12 @@ parameters:
     description: Time in seconds to wait for a pcmk resource to restart when
                  a config change is detected and the resource is being restarted
     type: number
+  ContainerCli:
+    type: string
+    default: 'docker'
+    description: CLI tool used to manage containers.
+    constraints:
+      - allowed_values: ['docker', 'podman']
   DeployIdentifier:
     default: ''
     type: string
@@ -113,6 +119,7 @@ outputs:
                   - 'pcmklatest'
             tripleo::profile::pacemaker::cinder::backup_bundle::docker_volumes: {get_attr: [CinderCommon, cinder_backup_volumes]}
             tripleo::profile::pacemaker::cinder::backup_bundle::docker_environment: {get_attr: [CinderCommon, cinder_backup_environment]}
+            tripleo::profile::pacemaker::cinder::backup_bundle::container_backend: {get_param: ContainerCli}
             cinder::backup::manage_service: false
             cinder::backup::enabled: false
       service_config_settings:

docker/services/pacemaker/cinder-volume.yaml

@@ -45,6 +45,12 @@ parameters:
     description: Time in seconds to wait for a pcmk resource to restart when
                  a config change is detected and the resource is being restarted
     type: number
+  ContainerCli:
+    type: string
+    default: 'docker'
+    description: CLI tool used to manage containers.
+    constraints:
+      - allowed_values: ['docker', 'podman']
   DeployIdentifier:
     default: ''
     type: string
@@ -99,6 +105,7 @@ outputs:
                   - 'pcmklatest'
             tripleo::profile::pacemaker::cinder::volume_bundle::docker_volumes: {get_attr: [CinderCommon, cinder_volume_volumes]}
             tripleo::profile::pacemaker::cinder::volume_bundle::docker_environment: {get_attr: [CinderCommon, cinder_volume_environment]}
+            tripleo::profile::pacemaker::cinder::volume_bundle::container_backend: {get_param: ContainerCli}
             cinder::volume::manage_service: false
             cinder::volume::enabled: false
             cinder::backend_host: hostgroup

docker/services/pacemaker/database/mysql.yaml

@@ -66,6 +66,12 @@ parameters:
     description: Time in seconds to wait for a pcmk resource to restart when
                  a config change is detected and the resource is being restarted
     type: number
+  ContainerCli:
+    type: string
+    default: 'docker'
+    description: CLI tool used to manage containers.
+    constraints:
+      - allowed_values: ['docker', 'podman']
 
 resources:
 
@@ -102,6 +108,7 @@ outputs:
                       expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
                   - 'pcmklatest'
             tripleo::profile::pacemaker::database::mysql_bundle::control_port: 3123
+            tripleo::profile::pacemaker::database::mysql_bundle::container_backend: {get_param: ContainerCli}
             tripleo::mysql::firewall_rules:
               '104 mysql galera-bundle':
                 dport:

docker/services/pacemaker/database/redis.yaml

@@ -52,6 +52,12 @@ parameters:
     description: Time in seconds to wait for a pcmk resource to restart when
                  a config change is detected and the resource is being restarted
     type: number
+  ContainerCli:
+    type: string
+    default: 'docker'
+    description: CLI tool used to manage containers.
+    constraints:
+      - allowed_values: ['docker', 'podman']
   DeployIdentifier:
     default: ''
     type: string
@@ -98,6 +104,7 @@ outputs:
                       expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
                   - 'pcmklatest'
             tripleo::profile::pacemaker::database::redis_bundle::control_port: 3124
+            tripleo::profile::pacemaker::database::redis_bundle::container_backend: {get_param: ContainerCli}
             tripleo::redis::firewall_rules:
               '108 redis-bundle':
                 dport:

docker/services/pacemaker/haproxy.yaml

@@ -84,6 +84,12 @@ parameters:
     description: Time in seconds to wait for a pcmk resource to restart when
                  a config change is detected and the resource is being restarted
     type: number
+  ContainerCli:
+    type: string
+    default: 'docker'
+    description: CLI tool used to manage containers.
+    constraints:
+      - allowed_values: ['docker', 'podman']
   DeployIdentifier:
     default: ''
     type: string
@@ -131,6 +137,7 @@ outputs:
           - get_attr: [HAProxyBase, role_data, config_settings]
           - haproxy_docker: true
             tripleo::profile::pacemaker::haproxy_bundle::haproxy_docker_image: &haproxy_image {get_param: DockerHAProxyImage}
+            tripleo::profile::pacemaker::haproxy_bundle::container_backend: {get_param: ContainerCli}
             # the list of directories that contain the certs to bind mount in the countainer
             # bind-mounting the directories rather than all the cert, key and pem files ensures
             # that docker won't create directories on the host when then pem files do not exist

docker/services/pacemaker/manila-share.yaml

@@ -45,6 +45,12 @@ parameters:
     description: Time in seconds to wait for a pcmk resource to restart when
                  a config change is detected and the resource is being restarted
     type: number
+  ContainerCli:
+    type: string
+    default: 'docker'
+    description: CLI tool used to manage containers.
+    constraints:
+      - allowed_values: ['docker', 'podman']
   DeployIdentifier:
     default: ''
     type: string
@@ -93,6 +99,7 @@ outputs:
                   - 'pcmklatest'
             tripleo::profile::pacemaker::manila::share_bundle::docker_volumes: {get_attr: [ManilaCommon, manila_share_volumes]}
             tripleo::profile::pacemaker::manila::share_bundle::docker_environment: {get_attr: [ManilaCommon, manila_share_environment]}
+            tripleo::profile::pacemaker::manila::share_bundle::container_backend: {get_param: ContainerCli}
             manila::share::manage_service: false
             manila::share::enabled: false
             manila::host: hostgroup

docker/services/pacemaker/notify-rabbitmq.yaml

@@ -49,6 +49,12 @@ parameters:
     description: Time in seconds to wait for a pcmk resource to restart when
                  a config change is detected and the resource is being restarted
     type: number
+  ContainerCli:
+    type: string
+    default: 'docker'
+    description: CLI tool used to manage containers.
+    constraints:
+      - allowed_values: ['docker', 'podman']
   DeployIdentifier:
     default: ''
     type: string
@@ -92,6 +98,7 @@ outputs:
                       expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
                   - 'pcmklatest'
             tripleo::profile::pacemaker::rabbitmq_bundle::control_port: 3122
+            tripleo::profile::pacemaker::rabbitmq_bundle::container_backend: {get_param: ContainerCli}
             tripleo::oslo_messaging_notify::firewall_rules:
               '109 rabbitmq-bundle':
                 dport:

docker/services/pacemaker/ovn-dbs.yaml

@@ -53,6 +53,12 @@ parameters:
     description: Time in seconds to wait for a pcmk resource to restart when
                  a config change is detected and the resource is being restarted
     type: number
+  ContainerCli:
+    type: string
+    default: 'docker'
+    description: CLI tool used to manage containers.
+    constraints:
+      - allowed_values: ['docker', 'podman']
   DeployIdentifier:
     default: ''
     type: string
@@ -97,6 +103,7 @@ outputs:
                   - 'pcmklatest'
           - tripleo::profile::pacemaker::ovn_dbs_bundle::nb_db_port: {get_param: OVNNorthboundServerPort}
           - tripleo::profile::pacemaker::ovn_dbs_bundle::sb_db_port: {get_param: OVNSouthboundServerPort}
+          - tripleo::profile::pacemaker::ovn_dbs_bundle::container_backend: {get_param: ContainerCli}
       service_config_settings: {get_attr: [OVNDbsBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/pacemaker/rabbitmq.yaml

@@ -49,6 +49,12 @@ parameters:
     description: Time in seconds to wait for a pcmk resource to restart when
                  a config change is detected and the resource is being restarted
     type: number
+  ContainerCli:
+    type: string
+    default: 'docker'
+    description: CLI tool used to manage containers.
+    constraints:
+      - allowed_values: ['docker', 'podman']
   DeployIdentifier:
     default: ''
     type: string
@@ -91,6 +97,7 @@ outputs:
                       expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
                   - 'pcmklatest'
             tripleo::profile::pacemaker::rabbitmq_bundle::control_port: 3122
+            tripleo::profile::pacemaker::rabbitmq_bundle::container_backend: {get_param: ContainerCli}
             tripleo::rabbitmq::firewall_rules:
               '109 rabbitmq-bundle':
                 dport:

docker/services/pacemaker/rpc-rabbitmq.yaml

@@ -49,6 +49,12 @@ parameters:
     description: Time in seconds to wait for a pcmk resource to restart when
                  a config change is detected and the resource is being restarted
     type: number
+  ContainerCli:
+    type: string
+    default: 'docker'
+    description: CLI tool used to manage containers.
+    constraints:
+      - allowed_values: ['docker', 'podman']
   DeployIdentifier:
     default: ''
     type: string
@@ -92,6 +98,7 @@ outputs:
                       expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
                   - 'pcmklatest'
             tripleo::profile::pacemaker::rabbitmq_bundle::control_port: 3122
+            tripleo::profile::pacemaker::rabbitmq_bundle::container_backend: {get_param: ContainerCli}
             tripleo::oslo_messaging_rpc::firewall_rules:
               '109 rabbitmq-bundle':
                 dport: