Remove implementations for Docker support

... because Docker support has been removed from tht and these are no longer used. Depends-on: https://review.opendev.org/843755 Change-Id: I5719d06464ba2c1d37898b44f70ac5521ceaaf7e
2022-05-30 11:57:40 +09:00 · 2022-05-30 11:57:40 +09:00 · ef041632ea
parent 8334e4f614
commit ef041632ea
35 changed files with 102 additions and 559 deletions
--- a/lib/facter/docker_group_gid.rb
+++ b/lib/facter/docker_group_gid.rb
@ -1,24 +0,0 @@
-# Copyright 2018 Red Hat, Inc.
-# All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-Facter.add('docker_group_gid') do
-  setcode do
-    begin
-      File::Stat.new("/var/run/docker.sock").gid
-    rescue
-      nil
-    end
-  end
-end
--- a/manifests/profile/base/neutron.pp
+++ b/manifests/profile/base/neutron.pp
@ -85,8 +85,8 @@
 # [*container_cli*]
 #   (Optional) A container CLI to be used with the wrapper
 #   tooling to manage containers controled by Neutron/OVN
-#   l3/dhcp/metadata agents. Accepts either 'podman' or 'docker'.
-#   Defaults to hiera('container_cli') or 'docker'.
+#   l3/dhcp/metadata agents. Accepts only 'podman'
+#   Defaults to hiera('container_cli', 'podman').
 #

 class tripleo::profile::base::neutron (
@ -105,16 +105,13 @@ class tripleo::profile::base::neutron (
  $oslomsg_notify_use_ssl  = hiera('oslo_messaging_notify_use_ssl', '0'),
  $dhcp_agents_per_network = undef,
  $dhcp_nodes              = hiera('neutron_dhcp_short_node_names', []),
-  $container_cli           = hiera('container_cli', 'docker'),
+  $container_cli           = hiera('container_cli', 'podman'),
 ) {
  if $step >= 3 {
    # NOTE(bogdando) validate_* is deprecated and we do not want to use it here
-    if !($container_cli in ['docker', 'podman']) {
+    if !($container_cli in ['podman']) {
      fail("container_cli (${container_cli}) is not supported!")
    }
-    if $container_cli == 'docker' {
-      warning('Docker runtime is deprecated. Consider switching container_cli to podman')
-    }
    $oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
    $oslomsg_notify_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_notify_use_ssl)))
    $dhcp_agent_count = size($dhcp_nodes)
--- a/manifests/profile/base/neutron/dhcp_agent_wrappers.pp
+++ b/manifests/profile/base/neutron/dhcp_agent_wrappers.pp
@ -19,8 +19,7 @@
 # === Parameters
 #
 # [*enable_dnsmasq_wrapper*]
-#  (Optional) If true, generates a wrapper for running dnsmasq in
-#  a docker container.
+#  (Optional) If true, generates a wrapper for running dnsmasq in a container.
 #  Defaults to false
 #
 # [*dnsmasq_process_wrapper*]
@ -28,13 +27,12 @@
 #   Defaults to undef
 #
 # [*dnsmasq_image*]
-#   (Optional) Docker image name for dnsmasq. Required if
+#   (Optional) Container image name for dnsmasq. Required if
 #   dnsmasq_process_wrapper is set.
 #   Defaults to undef
 #
 # [*enable_haproxy_wrapper*]
-#  (Optional) If true, generates a wrapper for running haproxy in
-#  a docker container.
+#  (Optional) If true, generates a wrapper for running haproxy in a container.
 #  Defaults to false
 #
 # [*haproxy_process_wrapper*]
@ -42,15 +40,10 @@
 #   Defaults to undef
 #
 # [*haproxy_image*]
-#   (Optional) Docker image name for haproxy. Required if
+#   (Optional) Container image name for haproxy. Required if
 #   haproxy_process_wrapper is set.
 #   Defaults to undef
 #
-# [*bind_sockets*]
-#   (Deprecated) Domain sockets that the wrappers should use for accessing
-#   the docker daemon.
-#   Defaults to hiera('docker_additional_sockets', ['/var/lib/openstack/docker.sock'])
-#
 # [*debug*]
 #   (Optional) Debug messages for the wrapper scripts.
 #   Defaults to False.
@ -63,25 +56,15 @@ class tripleo::profile::base::neutron::dhcp_agent_wrappers (
  $haproxy_process_wrapper = undef,
  $haproxy_image           = undef,
  Boolean $debug           = false,
-
-  # Deprecated
-  $bind_sockets            = hiera('docker_additional_sockets', ['/var/lib/openstack/docker.sock']),
 ) {
-  $container_cli = hiera('tripleo::profile::base::neutron::container_cli', 'docker')
-  if $bind_sockets and $container_cli == 'docker' {
-    warning('Docker runtime is deprecated. Consider switching container_cli to podman')
-    $bind_socket = join(['unix://', $bind_sockets[0]], '')
-  } else {
-    $bind_socket = ''
-  }
+  $container_cli = hiera('tripleo::profile::base::neutron::container_cli', 'podman')
  if $enable_dnsmasq_wrapper {
    unless $dnsmasq_image and $dnsmasq_process_wrapper{
-      fail('The docker image for dnsmasq and wrapper filename must be provided when generating dnsmasq wrappers')
+      fail('The container image for dnsmasq and wrapper filename must be provided when generating dnsmasq wrappers')
    }
    tripleo::profile::base::neutron::wrappers::dnsmasq{'dhcp_dnsmasq_process_wrapper':
      dnsmasq_process_wrapper => $dnsmasq_process_wrapper,
      dnsmasq_image           => $dnsmasq_image,
-      bind_socket             => $bind_socket,
      debug                   => $debug,
      container_cli           => $container_cli,
    }
@ -89,12 +72,11 @@ class tripleo::profile::base::neutron::dhcp_agent_wrappers (

  if $enable_haproxy_wrapper {
    unless $haproxy_image and $haproxy_process_wrapper{
-      fail('The docker image for haproxy and wrapper filename must be provided when generating haproxy wrappers')
+      fail('The container image for haproxy and wrapper filename must be provided when generating haproxy wrappers')
    }
    tripleo::profile::base::neutron::wrappers::haproxy{'dhcp_haproxy_process_wrapper':
      haproxy_process_wrapper => $haproxy_process_wrapper,
      haproxy_image           => $haproxy_image,
-      bind_socket             => $bind_socket,
      debug                   => $debug,
      container_cli           => $container_cli,
    }
--- a/manifests/profile/base/neutron/l3_agent_wrappers.pp
+++ b/manifests/profile/base/neutron/l3_agent_wrappers.pp
@ -19,8 +19,7 @@
 # === Parameters
 #
 # [*enable_haproxy_wrapper*]
-#  (Optional) If true, generates a wrapper for running haproxy in
-#  a docker container.
+#  (Optional) If true, generates a wrapper for running haproxy in a container.
 #  Defaults to false
 #
 # [*haproxy_process_wrapper*]
@ -28,13 +27,13 @@
 #   Defaults to undef
 #
 # [*haproxy_image*]
-#   (Optional) Docker image name for haproxy. Required if
+#   (Optional) Container image name for haproxy. Required if
 #   haproxy_process_wrapper is set.
 #   Defaults to undef
 #
 # [*enable_radvd_wrapper*]
 #  (Optional) If true, generates a wrapper for running radvd in
-#  a docker container.
+#  a container.
 #  Defaults to false
 #
 # [*radvd_process_wrapper*]
@ -42,13 +41,13 @@
 #   Defaults to undef
 #
 # [*radvd_image*]
-#   (Optional) Docker image name for haproxy. Required if radvd_process_wrapper
+#   (Optional) Container image name for haproxy. Required if radvd_process_wrapper
 #   is set.
 #   Defaults to undef
 #
 # [*enable_keepalived_wrapper*]
 #  (Optional) If true, generates a wrapper for running keepalived in
-#  a docker container.
+#  a container.
 #  Defaults to false
 #
 # [*keepalived_process_wrapper*]
@ -56,7 +55,7 @@
 #   Defaults to undef
 #
 # [*keepalived_image*]
-#   (Optional) Docker image name for keepalived. Required if
+#   (Optional) Container image name for keepalived. Required if
 #   keepalived_process_wrapper is set.
 #   Defaults to undef
 #
@ -67,8 +66,7 @@
 #   Defaults to undef
 #
 # [*enable_dibbler_wrapper*]
-#  (Optional) If true, generates a wrapper for running dibbler in
-#  a docker container.
+#  (Optional) If true, generates a wrapper for running dibbler in a container.
 #  Defaults to false
 #
 # [*dibbler_process_wrapper*]
@ -76,14 +74,9 @@
 #   Defaults to undef
 #
 # [*dibbler_image*]
-#   (Optional) Docker image name for dibbler. Required if dibbler_process_wrapper is set.
+#   (Optional) Container image name for dibbler. Required if dibbler_process_wrapper is set.
 #   Defaults to undef
 #
-# [*bind_sockets*]
-#   (Deprecated) Domain sockets that the wrappers should use for accessing
-#   the docker daemon.
-#   Defaults to hiera('docker_additional_sockets', ['/var/lib/openstack/docker.sock'])
-#
 # [*debug*]
 #   (Optional) Debug messages for the wrapper scripts.
 #   Defaults to False.
@ -103,25 +96,15 @@ class tripleo::profile::base::neutron::l3_agent_wrappers (
  $dibbler_process_wrapper         = undef,
  $dibbler_image                   = undef,
  Boolean $debug                   = false,
-
-  # Deprecated
-  $bind_sockets                    = hiera('docker_additional_sockets', ['/var/lib/openstack/docker.sock']),
 ) {
-  $container_cli = hiera('tripleo::profile::base::neutron::container_cli', 'docker')
-  if $bind_sockets and $container_cli == 'docker' {
-    warning('Docker runtime is deprecated. Consider switching container_cli to podman')
-    $bind_socket = join(['unix://', $bind_sockets[0]], '')
-  } else {
-    $bind_socket = ''
-  }
+  $container_cli = hiera('tripleo::profile::base::neutron::container_cli', 'podman')
  if $enable_haproxy_wrapper {
    unless $haproxy_image and $haproxy_process_wrapper{
-      fail('The docker image for haproxy and wrapper filename must be provided when generating haproxy wrappers')
+      fail('The container image for haproxy and wrapper filename must be provided when generating haproxy wrappers')
    }
    tripleo::profile::base::neutron::wrappers::haproxy{'l3_haproxy_process_wrapper':
      haproxy_process_wrapper => $haproxy_process_wrapper,
      haproxy_image           => $haproxy_image,
-      bind_socket             => $bind_socket,
      debug                   => $debug,
      container_cli           => $container_cli,
    }
@ -129,12 +112,11 @@ class tripleo::profile::base::neutron::l3_agent_wrappers (

  if $enable_radvd_wrapper {
    unless $radvd_image and $radvd_process_wrapper{
-      fail('The docker image for radvd and wrapper filename must be provided when generating radvd wrappers')
+      fail('The container image for radvd and wrapper filename must be provided when generating radvd wrappers')
    }
    tripleo::profile::base::neutron::wrappers::radvd{'l3_radvd_process_wrapper':
      radvd_process_wrapper => $radvd_process_wrapper,
      radvd_image           => $radvd_image,
-      bind_socket           => $bind_socket,
      debug                 => $debug,
      container_cli         => $container_cli,
    }
@ -142,12 +124,11 @@ class tripleo::profile::base::neutron::l3_agent_wrappers (

  if $enable_keepalived_wrapper {
    unless $keepalived_image and $keepalived_process_wrapper{
-      fail('The docker image for keepalived and wrapper filename must be provided when generating keepalived wrappers')
+      fail('The container image for keepalived and wrapper filename must be provided when generating keepalived wrappers')
    }
    tripleo::profile::base::neutron::wrappers::keepalived{'l3_keepalived':
      keepalived_process_wrapper => $keepalived_process_wrapper,
      keepalived_image           => $keepalived_image,
-      bind_socket                => $bind_socket,
      debug                      => $debug,
      container_cli              => $container_cli,
    }
@ -156,7 +137,6 @@ class tripleo::profile::base::neutron::l3_agent_wrappers (
    }
    tripleo::profile::base::neutron::wrappers::keepalived_state_change{'l3_keepalived_state_change':
      keepalived_state_change_wrapper => $keepalived_state_change_wrapper,
-      bind_socket                     => $bind_socket,
      debug                           => $debug,
      container_cli                   => $container_cli,
    }
@ -164,12 +144,11 @@ class tripleo::profile::base::neutron::l3_agent_wrappers (

  if $enable_dibbler_wrapper {
    unless $dibbler_image and $dibbler_process_wrapper{
-      fail('The docker image for dibbler and wrapper filename must be provided when generating dibbler wrappers')
+      fail('The container image for dibbler and wrapper filename must be provided when generating dibbler wrappers')
    }
    tripleo::profile::base::neutron::wrappers::dibbler_client{'l3_dibbler_daemon':
      dibbler_process_wrapper => $dibbler_process_wrapper,
      dibbler_image           => $dibbler_image,
-      bind_socket             => $bind_socket,
      debug                   => $debug,
      container_cli           => $container_cli,
    }
--- a/manifests/profile/base/neutron/ovn_metadata_agent_wrappers.pp
+++ b/manifests/profile/base/neutron/ovn_metadata_agent_wrappers.pp
@ -19,8 +19,7 @@
 # === Parameters
 #
 # [*enable_haproxy_wrapper*]
-#  (Optional) If true, generates a wrapper for running haproxy in
-#  a docker container.
+#  (Optional) If true, generates a wrapper for running haproxy in a container.
 #  Defaults to false
 #
 # [*haproxy_process_wrapper*]
@ -28,15 +27,10 @@
 #   Defaults to undef
 #
 # [*haproxy_image*]
-#   (Optional) Docker image name for haproxy. Required if
+#   (Optional) Container image name for haproxy. Required if
 #   haproxy_process_wrapper is set.
 #   Defaults to undef
 #
-# [*bind_sockets*]
-#   (Deprecated) Domain sockets that the wrappers should use for accessing
-#   the docker daemon.
-#   Defaults to hiera('docker_additional_sockets', ['/var/lib/openstack/docker.sock'])
-#
 # [*debug*]
 #   (Optional) Debug messages for the wrapper scripts.
 #   Defaults to False.
@ -46,25 +40,15 @@ class tripleo::profile::base::neutron::ovn_metadata_agent_wrappers (
  $haproxy_process_wrapper = undef,
  $haproxy_image           = undef,
  Boolean $debug           = false,
-
-  # Deprecated
-  $bind_sockets            = hiera('docker_additional_sockets', ['/var/lib/openstack/docker.sock']),
 ) {
-  $container_cli = hiera('tripleo::profile::base::neutron::container_cli', 'docker')
-  if $bind_sockets and $container_cli == 'docker' {
-    warning('Docker runtime is deprecated. Consider switching container_cli to podman')
-    $bind_socket = join(['unix://', $bind_sockets[0]], '')
-  } else {
-    $bind_socket = ''
-  }
+  $container_cli = hiera('tripleo::profile::base::neutron::container_cli', 'podman')
  if $enable_haproxy_wrapper {
    unless $haproxy_image and $haproxy_process_wrapper{
-      fail('The docker image for haproxy and wrapper filename must be provided when generating haproxy wrappers')
+      fail('The container image for haproxy and wrapper filename must be provided when generating haproxy wrappers')
    }
    tripleo::profile::base::neutron::wrappers::haproxy{'ovn_metadata_haproxy_process_wrapper':
      haproxy_process_wrapper => $haproxy_process_wrapper,
      haproxy_image           => $haproxy_image,
-      bind_socket             => $bind_socket,
      debug                   => $debug,
      container_cli           => $container_cli,
    }
--- a/manifests/profile/base/neutron/wrappers/dibbler_client.pp
+++ b/manifests/profile/base/neutron/wrappers/dibbler_client.pp
@ -22,10 +22,7 @@
 #   Filename for dibbler wrapper script.
 #
 # [*dibbler_image*]
-#   Docker image name for dibbler.
-#
-# [*bind_socket*]
-#   Socket for accessing the docker daemon.
+#   Container image name for dibbler.
 #
 # [*debug*]
 #   Enable debug messages for the wrapper script.
@ -38,14 +35,12 @@ define tripleo::profile::base::neutron::wrappers::dibbler_client (
  $dibbler_image,
  Boolean $debug,
  $container_cli,
-  $bind_socket = undef,
 ) {
    file { $dibbler_process_wrapper:
      ensure  => file,
      mode    => '0755',
      content => epp('tripleo/neutron/dibbler-client.epp', {
        'image_name'    => $dibbler_image,
-        'bind_socket'   => $bind_socket,
        'debug'         => $debug,
        'container_cli' => $container_cli,
        })
--- a/manifests/profile/base/neutron/wrappers/dnsmasq.pp
+++ b/manifests/profile/base/neutron/wrappers/dnsmasq.pp
@ -22,10 +22,7 @@
 #   Filename for dnsmasq wrapper script.
 #
 # [*dnsmasq_image*]
-#   Docker image name for dnsmasq.
-#
-# [*bind_socket*]
-#   Socket for accessing the docker daemon.
+#   Container image name for dnsmasq.
 #
 # [*debug*]
 #   Enable debug messages for the wrapper script.
@ -38,14 +35,12 @@ define tripleo::profile::base::neutron::wrappers::dnsmasq (
  $dnsmasq_image,
  Boolean $debug,
  $container_cli,
-  $bind_socket = undef,
 ) {
    file { $dnsmasq_process_wrapper:
      ensure  => file,
      mode    => '0755',
      content => epp('tripleo/neutron/dnsmasq.epp', {
        'image_name'    => $dnsmasq_image,
-        'bind_socket'   => $bind_socket,
        'debug'         => $debug,
        'container_cli' => $container_cli,
        })
--- a/manifests/profile/base/neutron/wrappers/haproxy.pp
+++ b/manifests/profile/base/neutron/wrappers/haproxy.pp
@ -22,10 +22,7 @@
 #   Filename for haproxy wrapper script.
 #
 # [*haproxy_image*]
-#   Docker image name for haproxy.
-#
-# [*bind_socket*]
-#   Socket for accessing the docker daemon.
+#   Container image name for haproxy.
 #
 # [*debug*]
 #   Enable debug messages for the wrapper script.
@ -38,14 +35,12 @@ define tripleo::profile::base::neutron::wrappers::haproxy (
  $haproxy_image,
  Boolean $debug,
  $container_cli,
-  $bind_socket = undef,
 ) {
    file { $haproxy_process_wrapper:
      ensure  => file,
      mode    => '0755',
      content => epp('tripleo/neutron/haproxy.epp', {
        'image_name'    => $haproxy_image,
-        'bind_socket'   => $bind_socket,
        'debug'         => $debug,
        'container_cli' => $container_cli,
        })
--- a/manifests/profile/base/neutron/wrappers/keepalived.pp
+++ b/manifests/profile/base/neutron/wrappers/keepalived.pp
@ -22,10 +22,7 @@
 #   Filename for keepalived wrapper script.
 #
 # [*keepalived_image*]
-#   Docker image name for keepalived.
-#
-# [*bind_socket*]
-#   Socket for accessing the docker daemon.
+#   Container image name for keepalived.
 #
 # [*debug*]
 #   Enable debug messages for the wrapper script.
@ -38,14 +35,12 @@ define tripleo::profile::base::neutron::wrappers::keepalived (
  $keepalived_image,
  Boolean $debug,
  $container_cli,
-  $bind_socket = undef,
 ) {
    file { $keepalived_process_wrapper:
      ensure  => file,
      mode    => '0755',
      content => epp('tripleo/neutron/keepalived.epp', {
          'image_name'    => $keepalived_image,
-          'bind_socket'   => $bind_socket,
          'debug'         => $debug,
          'container_cli' => $container_cli,
        })
--- a/manifests/profile/base/neutron/wrappers/keepalived_state_change.pp
+++ b/manifests/profile/base/neutron/wrappers/keepalived_state_change.pp
@ -21,9 +21,6 @@
 # [*keepalived_state_change_wrapper*]
 #   Filename for neutron-keepalived-state-change wrapper script.
 #
-# [*bind_socket*]
-#   Socket for accessing the docker daemon.
-#
 # [*debug*]
 #   Enable debug messages for the wrapper script.
 #
@ -34,13 +31,11 @@ define tripleo::profile::base::neutron::wrappers::keepalived_state_change (
  $keepalived_state_change_wrapper,
  Boolean $debug,
  $container_cli,
-  $bind_socket = undef,
 ) {
    file { $keepalived_state_change_wrapper:
      ensure  => file,
      mode    => '0755',
      content => epp('tripleo/neutron/neutron-keepalived-state-change.epp', {
-        'bind_socket'   => $bind_socket,
        'debug'         => $debug,
        'container_cli' => $container_cli,
        })
--- a/manifests/profile/base/neutron/wrappers/radvd.pp
+++ b/manifests/profile/base/neutron/wrappers/radvd.pp
@ -22,10 +22,7 @@
 #   Filename for radvd wrapper script.
 #
 # [*radvd_image*]
-#   Docker image name for radvd.
-#
-# [*bind_socket*]
-#   Socket for accessing the docker daemon.
+#   Container image name for radvd.
 #
 # [*debug*]
 #   Enable debug messages for the wrapper script.
@ -39,14 +36,12 @@ define tripleo::profile::base::neutron::wrappers::radvd (
  $radvd_image,
  Boolean $debug,
  $container_cli,
-  $bind_socket = undef,
 ) {
    file { $radvd_process_wrapper:
      ensure  => file,
      mode    => '0755',
      content => epp('tripleo/neutron/radvd.epp', {
          'image_name'    => $radvd_image,
-          'bind_socket'   => $bind_socket,
          'debug'         => $debug,
          'container_cli' => $container_cli,
        })
--- a/manifests/profile/base/nova/virtlogd_wrapper.pp
+++ b/manifests/profile/base/nova/virtlogd_wrapper.pp
@ -19,8 +19,7 @@
 # === Parameters
 #
 # [*enable_wrapper*]
-#  (Optional) If true, generates a wrapper for running virtlogd in
-#  a docker container.
+#  (Optional) If true, generates a wrapper for running virtlogd in a container.
 #  Defaults to false
 #
 # [*virtlogd_process_wrapper*]
@ -28,7 +27,7 @@
 #   Defaults to undef
 #
 # [*virtlogd_image*]
-#   (Optional) Docker image name for virtlogd. Required if
+#   (Optional) Container image name for virtlogd. Required if
 #   virtlogd_wrapper is set.
 #   Defaults to undef
 #
@ -44,7 +43,7 @@ class tripleo::profile::base::nova::virtlogd_wrapper (
 ) {
  if $enable_wrapper {
    unless $virtlogd_image and $virtlogd_process_wrapper{
-      fail('The docker image for virtlogd and wrapper filename must be provided when generating virtlogd wrappers')
+      fail('The container image for virtlogd and wrapper filename must be provided when generating virtlogd wrappers')
    }
    tripleo::profile::base::nova::wrappers::virtlogd{'nova_virtlogd_wrapper':
      virtlogd_process_wrapper => $virtlogd_process_wrapper,
--- a/manifests/profile/base/nova/wrappers/virtlogd.pp
+++ b/manifests/profile/base/nova/wrappers/virtlogd.pp
@ -22,7 +22,7 @@
 #   Filename for virtlogd wrapper script.
 #
 # [*virtlogd_image*]
-#   Docker image name for virtlogd.
+#   Container image name for virtlogd.
 #
 # [*debug*]
 #   Enable debug messages for the wrapper script.
--- a/manifests/profile/base/pacemaker.pp
+++ b/manifests/profile/base/pacemaker.pp
@ -189,25 +189,6 @@ class tripleo::profile::base::pacemaker (
      pcsd_bind_addr       => $pcsd_bind_addr,
      tls_priorities       => $tls_priorities,
    }
-    if str2bool(lookup('docker_enabled', undef, undef, false)) {
-      include systemd::systemctl::daemon_reload
-
-      Package<| name == 'docker' |>
-      -> file { '/etc/systemd/system/resource-agents-deps.target.wants':
-        ensure => directory,
-      }
-      -> systemd::unit_file { 'docker.service':
-        path   => '/etc/systemd/system/resource-agents-deps.target.wants',
-        target => '/usr/lib/systemd/system/docker.service',
-        before => Class['pacemaker'],
-      }
-      -> systemd::unit_file { 'rhel-push-plugin.service':
-        path   => '/etc/systemd/system/resource-agents-deps.target.wants',
-        target => '/usr/lib/systemd/system/rhel-push-plugin.service',
-        before => Class['pacemaker'],
-      }
-      ~> Class['systemd::systemctl::daemon_reload']
-    }

    if $pacemaker_master {
      class { 'pacemaker::stonith':
--- a/manifests/profile/base/pacemaker_remote.pp
+++ b/manifests/profile/base/pacemaker_remote.pp
@ -82,25 +82,7 @@ class tripleo::profile::base::pacemaker_remote (
    force_authkey  => $force_authkey,
    tls_priorities => $tls_priorities,
  }
-  if str2bool(lookup('docker_enabled', undef, undef, false)) {
-    include systemd::systemctl::daemon_reload

-    Package<| name == 'docker' |>
-    -> file { '/etc/systemd/system/resource-agents-deps.target.wants':
-      ensure => directory,
-    }
-    -> systemd::unit_file { 'docker.service':
-      path   => '/etc/systemd/system/resource-agents-deps.target.wants',
-      target => '/usr/lib/systemd/system/docker.service',
-      before => Class['pacemaker::remote'],
-    }
-    -> systemd::unit_file { 'rhel-push-plugin.service':
-      path   => '/etc/systemd/system/resource-agents-deps.target.wants',
-      target => '/usr/lib/systemd/system/rhel-push-plugin.service',
-      before => Class['pacemaker::remote'],
-    }
-    ~> Class['systemd::systemctl::daemon_reload']
-  }
  $enable_fencing_real = str2bool($enable_fencing) and $step >= 5

  if $enable_fencing_real {
--- a/manifests/profile/pacemaker/cinder/backup_bundle.pp
+++ b/manifests/profile/pacemaker/cinder/backup_bundle.pp
@ -45,12 +45,11 @@
 #
 # [*container_backend*]
 #   (optional) Container backend to use when creating the bundle
-#   Defaults to 'docker'
+#   Defaults to 'podman'
 #
 # [*log_driver*]
-#   (optional) Container log driver to use. When set to undef it uses 'k8s-file'
-#   when container_cli is set to podman and 'journald' when it is set to docker.
-#   Defaults to undef
+#   (optional) Container log driver to use.
+#   Defaults to 'k8s-file'
 #
 # [*log_file*]
 #   (optional) Container log file to use. Only relevant when log_driver is
@ -74,9 +73,9 @@ class tripleo::profile::pacemaker::cinder::backup_bundle (
  $cinder_backup_docker_image = undef,
  $docker_volumes             = [],
  $docker_environment         = {'KOLLA_CONFIG_STRATEGY' => 'COPY_ALWAYS'},
-  $container_backend          = 'docker',
+  $container_backend          = 'podman',
  $ceph_conf_path             = '/etc/ceph',
-  $log_driver                 = undef,
+  $log_driver                 = 'k8s-file',
  $log_file                   = '/var/log/containers/stdouts/openstack-cinder-backup.log',
  $tls_priorities             = hiera('tripleo::pacemaker::tls_priorities', undef),
  $bundle_user                = 'root',
@ -88,16 +87,8 @@ class tripleo::profile::pacemaker::cinder::backup_bundle (
  } else {
    $pacemaker_master = false
  }
-  if $log_driver == undef {
-    if hiera('container_cli', 'docker') == 'podman' {
-      $log_driver_real = 'k8s-file'
-    } else {
-      $log_driver_real = 'journald'
-    }
-  } else {
-    $log_driver_real = $log_driver
-  }
-  if $log_driver_real == 'k8s-file' {
+
+  if $log_driver == 'k8s-file' {
    $log_file_real = " --log-opt path=${log_file}"
  } else {
    $log_file_real = ''
@ -241,7 +232,7 @@ class tripleo::profile::pacemaker::cinder::backup_bundle (
        },
        container_options => 'network=host',
        # lint:ignore:140chars
-        options           => "--ipc=host --privileged=true --user=${bundle_user} --log-driver=${log_driver_real}${log_file_real} ${docker_env}${tls_priorities_real}",
+        options           => "--ipc=host --privileged=true --user=${bundle_user} --log-driver=${log_driver}${log_file_real} ${docker_env}${tls_priorities_real}",
        # lint:endignore
        run_command       => '/bin/bash /usr/local/bin/kolla_start',
        storage_maps      => $storage_maps,
--- a/manifests/profile/pacemaker/cinder/volume_bundle.pp
+++ b/manifests/profile/pacemaker/cinder/volume_bundle.pp
@ -45,16 +45,15 @@
 #
 # [*container_backend*]
 #   (optional) Container backend to use when creating the bundle
-#   Defaults to 'docker'
+#   Defaults to 'podman'
 #
 # [*ceph_conf_path*]
 #   (optional) The path where the Ceph Cluster config files are stored on the host
 #   Defaults to '/etc/ceph'
 #
 # [*log_driver*]
-#   (optional) Container log driver to use. When set to undef it uses 'k8s-file'
-#   when container_cli is set to podman and 'journald' when it is set to docker.
-#   Defaults to undef
+#   (optional) Container log driver to use.
+#   Defaults to 'k8s-file'
 #
 # [*log_file*]
 #   (optional) Container log file to use. Only relevant when log_driver is
@ -76,9 +75,9 @@ class tripleo::profile::pacemaker::cinder::volume_bundle (
  $docker_environment         = {'KOLLA_CONFIG_STRATEGY' => 'COPY_ALWAYS'},
  $pcs_tries                  = hiera('pcs_tries', 20),
  $step                       = Integer(hiera('step')),
-  $container_backend          = 'docker',
+  $container_backend          = 'podman',
  $ceph_conf_path             = '/etc/ceph',
-  $log_driver                 = undef,
+  $log_driver                 = 'k8s-file',
  $log_file                   = '/var/log/containers/stdouts/openstack-cinder-volume.log',
  $tls_priorities             = hiera('tripleo::pacemaker::tls_priorities', undef),
  $bundle_user                = 'root',
@ -89,16 +88,7 @@ class tripleo::profile::pacemaker::cinder::volume_bundle (
    $pacemaker_master = false
  }

-  if $log_driver == undef {
-    if hiera('container_cli', 'docker') == 'podman' {
-      $log_driver_real = 'k8s-file'
-    } else {
-      $log_driver_real = 'journald'
-    }
-  } else {
-    $log_driver_real = $log_driver
-  }
-  if $log_driver_real == 'k8s-file' {
+  if $log_driver == 'k8s-file' {
    $log_file_real = " --log-opt path=${log_file}"
  } else {
    $log_file_real = ''
@ -242,7 +232,7 @@ class tripleo::profile::pacemaker::cinder::volume_bundle (
        },
        container_options => 'network=host',
        # lint:ignore:140chars
-        options           => "--ipc=host --privileged=true --user=${bundle_user} --log-driver=${log_driver_real}${log_file_real} ${docker_env}${tls_priorities_real}",
+        options           => "--ipc=host --privileged=true --user=${bundle_user} --log-driver=${log_driver}${log_file_real} ${docker_env}${tls_priorities_real}",
        # lint:endignore
        run_command       => '/bin/bash /usr/local/bin/kolla_start',
        storage_maps      => $storage_maps,
--- a/manifests/profile/pacemaker/database/mysql_bundle.pp
+++ b/manifests/profile/pacemaker/database/mysql_bundle.pp
@ -126,12 +126,11 @@
 #
 # [*container_backend*]
 #   (optional) Container backend to use when creating the bundle
-#   Defaults to 'docker'
+#   Defaults to 'podman'
 #
 # [*log_driver*]
-#   (optional) Container log driver to use. When set to undef it uses 'k8s-file'
-#   when container_cli is set to podman and 'journald' when it is set to docker.
-#   Defaults to undef
+#   (optional) Container log driver to use.
+#   Defaults to 'k8s-file'
 #
 # [*log_file*]
 #   (optional) Container log file to use. Only relevant when log_driver is
@ -203,8 +202,8 @@ class tripleo::profile::pacemaker::database::mysql_bundle (
  $mysql_server_options           = hiera('tripleo::profile::base::database::mysql::mysql_server_options', {}),
  $mysql_auth_ed25519             = hiera('mysql_auth_ed25519', false),
  $two_node_mode                  = false,
-  $container_backend              = 'docker',
-  $log_driver                     = undef,
+  $container_backend              = 'podman',
+  $log_driver                     = 'k8s-file',
  $log_file                       = '/var/log/containers/stdouts/galera-bundle.log',
  $tls_priorities                 = hiera('tripleo::pacemaker::tls_priorities', undef),
  $bundle_user                    = 'root',
@ -225,16 +224,7 @@ class tripleo::profile::pacemaker::database::mysql_bundle (
    $pacemaker_master = false
  }

-  if $log_driver == undef {
-    if hiera('container_cli', 'docker') == 'podman' {
-      $log_driver_real = 'k8s-file'
-    } else {
-      $log_driver_real = 'journald'
-    }
-  } else {
-    $log_driver_real = $log_driver
-  }
-  if $log_driver_real == 'k8s-file' {
+  if $log_driver == 'k8s-file' {
    $log_file_real = " --log-opt path=${log_file}"
  } else {
    $log_file_real = ''
@ -520,7 +510,7 @@ MYSQL_HOST=localhost\n",
        },
        container_options => 'network=host',
        # lint:ignore:140chars
-        options           => "--user=${bundle_user} --log-driver=${log_driver_real}${log_file_real} -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS${tls_priorities_real}",
+        options           => "--user=${bundle_user} --log-driver=${log_driver}${log_file_real} -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS${tls_priorities_real}",
        # lint:endignore
        run_command       => '/bin/bash /usr/local/bin/kolla_start',
        network           => "control-port=${control_port}",
--- a/manifests/profile/pacemaker/database/redis_bundle.pp
+++ b/manifests/profile/pacemaker/database/redis_bundle.pp
@ -93,12 +93,11 @@
 #
 # [*container_backend*]
 #   (optional) Container backend to use when creating the bundle
-#   Defaults to 'docker'
+#   Defaults to 'podman'
 #
 # [*log_driver*]
-#   (optional) Container log driver to use. When set to undef it uses 'k8s-file'
-#   when container_cli is set to podman and 'journald' when it is set to docker.
-#   Defaults to undef
+#   (optional) Container log driver to use.
+#   Defaults to 'k8s-file'
 #
 # [*log_file*]
 #   (optional) Container log file to use. Only relevant when log_driver is
@ -122,9 +121,9 @@ class tripleo::profile::pacemaker::database::redis_bundle (
  $bootstrap_node            = hiera('redis_short_bootstrap_node_name'),
  $redis_docker_image        = undef,
  $redis_docker_control_port = 3124,
-  $container_backend         = 'docker',
+  $container_backend         = 'podman',
  $pcs_tries                 = hiera('pcs_tries', 20),
-  $log_driver                = undef,
+  $log_driver                = 'k8s-file',
  $log_file                  = '/var/log/containers/stdouts/redis-bundle.log',
  $step                      = Integer(hiera('step')),
  $redis_network             = hiera('redis_network', undef),
@ -144,16 +143,7 @@ class tripleo::profile::pacemaker::database::redis_bundle (
    $pacemaker_master = false
  }

-  if $log_driver == undef {
-    if hiera('container_cli', 'docker') == 'podman' {
-      $log_driver_real = 'k8s-file'
-    } else {
-      $log_driver_real = 'journald'
-    }
-  } else {
-    $log_driver_real = $log_driver
-  }
-  if $log_driver_real == 'k8s-file' {
+  if $log_driver == 'k8s-file' {
    $log_file_real = " --log-opt path=${log_file}"
  } else {
    $log_file_real = ''
@ -369,7 +359,7 @@ slave-announce-port ${local_tuple[0][2]}
        },
        container_options => 'network=host',
        # lint:ignore:140chars
-        options           => "--user=${bundle_user} --log-driver=${log_driver_real}${log_file_real} -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS${tls_priorities_real}",
+        options           => "--user=${bundle_user} --log-driver=${log_driver}${log_file_real} -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS${tls_priorities_real}",
        # lint:endignore
        run_command       => '/bin/bash /usr/local/bin/kolla_start',
        network           => "control-port=${redis_docker_control_port}",
--- a/manifests/profile/pacemaker/haproxy_bundle.pp
+++ b/manifests/profile/pacemaker/haproxy_bundle.pp
@ -69,12 +69,11 @@
 #
 # [*container_backend*]
 #   (optional) Container backend to use when creating the bundle
-#   Defaults to 'docker'
+#   Defaults to 'podman'
 #
 # [*log_driver*]
-#   (optional) Container log driver to use. When set to undef it uses 'k8s-file'
-#   when container_cli is set to podman and 'journald' when it is set to docker.
-#   Defaults to undef
+#   (optional) Container log driver to use.
+#   Defaults to 'k8s-file'
 #
 # [*log_file*]
 #   (optional) Container log file to use. Only relevant when log_driver is
@ -116,11 +115,11 @@ class tripleo::profile::pacemaker::haproxy_bundle (
  $deployed_ssl_cert_path   = hiera('tripleo::haproxy::service_certificate', undef),
  $meta_params              = '',
  $op_params                = '',
-  $container_backend        = 'docker',
+  $container_backend        = 'podman',
  $tls_priorities           = hiera('tripleo::pacemaker::tls_priorities', undef),
  $bundle_user              = 'root',
  $force_nic                = hiera('tripleo::pacemaker::force_nic', undef),
-  $log_driver               = undef,
+  $log_driver               = 'k8s-file',
  $log_file                 = '/var/log/containers/stdouts/haproxy-bundle.log',
  $step                     = Integer(hiera('step')),
  $pcs_tries                = hiera('pcs_tries', 20),
@ -133,16 +132,7 @@ class tripleo::profile::pacemaker::haproxy_bundle (
    $pacemaker_master = false
  }

-  if $log_driver == undef {
-    if hiera('container_cli', 'docker') == 'podman' {
-      $log_driver_real = 'k8s-file'
-    } else {
-      $log_driver_real = 'journald'
-    }
-  } else {
-    $log_driver_real = $log_driver
-  }
-  if $log_driver_real == 'k8s-file' {
+  if $log_driver == 'k8s-file' {
    $log_file_real = " --log-opt path=${log_file}"
  } else {
    $log_file_real = ''
@ -297,7 +287,7 @@ class tripleo::profile::pacemaker::haproxy_bundle (
        location_rule     => $haproxy_location_rule,
        container_options => 'network=host',
        # lint:ignore:140chars
-        options           => "--user=${bundle_user} --log-driver=${log_driver_real}${log_file_real} -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS${tls_priorities_real}",
+        options           => "--user=${bundle_user} --log-driver=${log_driver}${log_file_real} -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS${tls_priorities_real}",
        # lint:endignore
        run_command       => '/bin/bash /usr/local/bin/kolla_start',
        storage_maps      => merge($storage_maps, $cert_storage_maps, $storage_maps_internal_tls),
--- a/manifests/profile/pacemaker/manila/share_bundle.pp
+++ b/manifests/profile/pacemaker/manila/share_bundle.pp
@ -49,16 +49,15 @@
 #
 # [*container_backend*]
 #   (optional) Container backend to use when creating the bundle
-#   Defaults to 'docker'
+#   Defaults to 'podman'
 #
 # [*ceph_conf_path*]
 #   (optional) The path where the Ceph Cluster config files are stored on the host
 #   Defaults to '/etc/ceph'
 #
 # [*log_driver*]
-#   (optional) Container log driver to use. When set to undef it uses 'k8s-file'
-#   when container_cli is set to podman and 'journald' when it is set to docker.
-#   Defaults to undef
+#   (optional) Container log driver to use.
+#   Defaults to 'k8s-file'
 #
 # [*log_file*]
 #   (optional) Container log file to use. Only relevant when log_driver is
@ -79,11 +78,11 @@ class tripleo::profile::pacemaker::manila::share_bundle (
  $docker_volumes             = [],
  $docker_environment         = {'KOLLA_CONFIG_STRATEGY' => 'COPY_ALWAYS'},
  $ceph_nfs_enabled           = hiera('ceph_nfs_enabled', false),
-  $container_backend          = 'docker',
+  $container_backend          = 'podman',
  $ceph_conf_path             = '/etc/ceph',
  $tls_priorities             = hiera('tripleo::pacemaker::tls_priorities', undef),
  $bundle_user                = 'root',
-  $log_driver                 = undef,
+  $log_driver                 = 'k8s-file',
  $log_file                   = '/var/log/containers/stdouts/openstack-manila-share.log',
  $pcs_tries                  = hiera('pcs_tries', 20),
  $step                       = Integer(hiera('step')),
@ -94,16 +93,7 @@ class tripleo::profile::pacemaker::manila::share_bundle (
    $pacemaker_master = false
  }

-  if $log_driver == undef {
-    if hiera('container_cli', 'docker') == 'podman' {
-      $log_driver_real = 'k8s-file'
-    } else {
-      $log_driver_real = 'journald'
-    }
-  } else {
-    $log_driver_real = $log_driver
-  }
-  if $log_driver_real == 'k8s-file' {
+  if $log_driver == 'k8s-file' {
    $log_file_real = " --log-opt path=${log_file}"
  } else {
    $log_file_real = ''
@ -265,7 +255,7 @@ class tripleo::profile::pacemaker::manila::share_bundle (
        },
        container_options => 'network=host',
        # lint:ignore:140chars
-        options           => "--ipc=host --privileged=true --user=${bundle_user} --log-driver=${log_driver_real}${log_file_real} ${docker_env}${tls_priorities_real}",
+        options           => "--ipc=host --privileged=true --user=${bundle_user} --log-driver=${log_driver}${log_file_real} ${docker_env}${tls_priorities_real}",
        # lint:endignore
        run_command       => '/bin/bash /usr/local/bin/kolla_start',
        storage_maps      => $storage_maps,
--- a/manifests/profile/pacemaker/ovn_dbs_bundle.pp
+++ b/manifests/profile/pacemaker/ovn_dbs_bundle.pp
@ -62,12 +62,11 @@
 #
 # [*container_backend*]
 #   (optional) Container backend to use when creating the bundle
-#   Defaults to 'docker'
+#   Defaults to 'podman'
 #
 # [*log_driver*]
-#   (optional) Container log driver to use. When set to undef it uses 'k8s-file'
-#   when container_cli is set to podman and 'journald' when it is set to docker.
-#   Defaults to undef
+#   (optional) Container log driver to use.
+#   Defaults to 'k8s-file'
 #
 # [*log_file*]
 #   (optional) Container log file to use. Only relevant when log_driver is
@ -136,10 +135,10 @@ class tripleo::profile::pacemaker::ovn_dbs_bundle (
  $sb_db_port                  = 6642,
  $meta_params                 = '',
  $op_params                   = '',
-  $container_backend           = 'docker',
+  $container_backend           = 'podman',
  $tls_priorities              = hiera('tripleo::pacemaker::tls_priorities', undef),
  $bundle_user                 = undef,
-  $log_driver                  = undef,
+  $log_driver                  = 'k8s-file',
  $log_file                    = '/var/log/containers/stdouts/ovn-dbs-bundle.log',
  $enable_internal_tls         = hiera('enable_internal_tls', false),
  $ca_file                     = undef,
@ -158,16 +157,7 @@ class tripleo::profile::pacemaker::ovn_dbs_bundle (
    $pacemaker_master = false
  }

-  if $log_driver == undef {
-    if hiera('container_cli', 'docker') == 'podman' {
-      $log_driver_real = 'k8s-file'
-    } else {
-      $log_driver_real = 'journald'
-    }
-  } else {
-    $log_driver_real = $log_driver
-  }
-  if $log_driver_real == 'k8s-file' {
+  if $log_driver == 'k8s-file' {
    $log_file_real = " --log-opt path=${log_file}"
  } else {
    $log_file_real = ''
@ -296,7 +286,7 @@ nb_master_protocol=ssl sb_master_protocol=ssl"
        location_rule     => $ovn_dbs_location_rule,
        container_options => 'network=host',
        # lint:ignore:140chars
-        options           => "${bundle_user_real}--log-driver=${log_driver_real}${log_file_real} -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS${tls_priorities_real}",
+        options           => "${bundle_user_real}--log-driver=${log_driver}${log_file_real} -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS${tls_priorities_real}",
        # lint:endignore
        run_command       => '/bin/bash /usr/local/bin/kolla_start',
        network           => "control-port=${ovn_dbs_control_port}",
--- a/manifests/profile/pacemaker/rabbitmq_bundle.pp
+++ b/manifests/profile/pacemaker/rabbitmq_bundle.pp
@ -85,12 +85,11 @@
 #
 # [*container_backend*]
 #   (optional) Container backend to use when creating the bundle
-#   Defaults to 'docker'
+#   Defaults to 'podman'
 #
 # [*log_driver*]
-#   (optional) Container log driver to use. When set to undef it uses 'k8s-file'
-#   when container_cli is set to podman and 'journald' when it is set to docker.
-#   Defaults to undef
+#   (optional) Container log driver to use.
+#   Defaults to 'k8s-file'
 #
 # [*log_file*]
 #   (optional) Container log file to use. Only relevant when log_driver is
@ -154,8 +153,8 @@ class tripleo::profile::pacemaker::rabbitmq_bundle (
  $rabbitmq_extra_policies      = hiera('rabbitmq_extra_policies', {'ha-promote-on-shutdown' => 'always'}),
  $pcs_tries                    = hiera('pcs_tries', 20),
  $step                         = Integer(hiera('step')),
-  $container_backend            = 'docker',
-  $log_driver                   = undef,
+  $container_backend            = 'podman',
+  $log_driver                   = 'k8s-file',
  $log_file                     = '/var/log/containers/stdouts/rabbitmq-bundle.log',
  $tls_priorities               = hiera('tripleo::pacemaker::tls_priorities', undef),
  $bundle_user                  = 'root',
@ -194,16 +193,7 @@ class tripleo::profile::pacemaker::rabbitmq_bundle (
    $pacemaker_master = false
  }

-  if $log_driver == undef {
-    if hiera('container_cli', 'docker') == 'podman' {
-      $log_driver_real = 'k8s-file'
-    } else {
-      $log_driver_real = 'journald'
-    }
-  } else {
-    $log_driver_real = $log_driver
-  }
-  if $log_driver_real == 'k8s-file' {
+  if $log_driver == 'k8s-file' {
    $log_file_real = " --log-opt path=${log_file}"
  } else {
    $log_file_real = ''
@ -373,7 +363,7 @@ class tripleo::profile::pacemaker::rabbitmq_bundle (
          },
          container_options => 'network=host',
          # lint:ignore:140chars
-          options           => "--user=${bundle_user} --log-driver=${log_driver_real}${log_file_real} -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS -e LANG=en_US.UTF-8 -e LC_ALL=en_US.UTF-8${tls_priorities_real}",
+          options           => "--user=${bundle_user} --log-driver=${log_driver}${log_file_real} -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS -e LANG=en_US.UTF-8 -e LC_ALL=en_US.UTF-8${tls_priorities_real}",
          # lint:endignore
          run_command       => '/bin/bash /usr/local/bin/kolla_start',
          network           => "control-port=${rabbitmq_docker_control_port}",
@ -431,7 +421,7 @@ class tripleo::profile::pacemaker::rabbitmq_bundle (
          },
          container_options => 'network=host',
          # lint:ignore:140chars
-          options           => "--user=${bundle_user} --log-driver=${log_driver_real}${log_file_real} -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS -e LANG=en_US.UTF-8 -e LC_ALL=en_US.UTF-8${tls_priorities_real}",
+          options           => "--user=${bundle_user} --log-driver=${log_driver}${log_file_real} -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS -e LANG=en_US.UTF-8 -e LC_ALL=en_US.UTF-8${tls_priorities_real}",
          # lint:endignore
          run_command       => '/bin/bash /usr/local/bin/kolla_start',
          network           => "control-port=${rabbitmq_docker_control_port}",
--- a/spec/defines/tripleo_profile_base_neutron_wrappers_dibbler_client_spec.rb
+++ b/spec/defines/tripleo_profile_base_neutron_wrappers_dibbler_client_spec.rb
@ -24,35 +24,6 @@ describe 'tripleo::profile::base::neutron::wrappers::dibbler_client' do

  shared_examples_for 'tripleo::profile::base::neutron::wrappers::dibbler_client' do

-    context 'creates wrapper file for docker' do
-      let :params do {
-          :dibbler_process_wrapper  => '/usr/local/bin/dibbler-client',
-          :dibbler_image            => 'a_registry/some_container_name:some_tag',
-          :bind_socket              => 'unix:///run/another/docker.sock',
-          :container_cli            => 'docker',
-          :debug                    => true,
-      }
-      end
-
-      it 'should generate a wrapper file' do
-        is_expected.to contain_file('/usr/local/bin/dibbler-client').with(
-          :mode   => '0755'
-        )
-        is_expected.to contain_file('/usr/local/bin/dibbler-client').with_content(
-          /a_registry.some_container_name.some_tag/
-        )
-        is_expected.to contain_file('/usr/local/bin/dibbler-client').with_content(
-          /export DOCKER_HOST="unix:...run.another.docker.sock/
-        )
-        is_expected.to contain_file('/usr/local/bin/dibbler-client').with_content(
-          /set -x/
-        )
-        is_expected.to contain_file('/usr/local/bin/dibbler-client').with_content(
-          /CMD="ip netns exec.*\/usr\/sbin\/dibbler-client run/
-        )
-      end
-    end
-
    context 'creates wrapper file for podman' do
      let :params do {
          :dibbler_process_wrapper  => '/usr/local/bin/dibbler-client',
--- a/spec/defines/tripleo_profile_base_neutron_wrappers_dnsmasq_spec.rb
+++ b/spec/defines/tripleo_profile_base_neutron_wrappers_dnsmasq_spec.rb
@ -24,36 +24,6 @@ describe 'tripleo::profile::base::neutron::wrappers::dnsmasq' do

  shared_examples_for 'tripleo::profile::base::neutron::wrappers::dnsmasq' do

-    context 'creates wrapper file for docker' do
-      let(:params) {
-        {
-          :dnsmasq_process_wrapper  => '/usr/local/bin/dnsmasq',
-          :dnsmasq_image            => 'a_registry/some_container_name:some_tag',
-          :bind_socket              => 'unix:///run/another/docker.sock',
-          :container_cli            => 'docker',
-          :debug                    => true,
-        }
-      }
-
-      it 'should generate a wrapper file' do
-        is_expected.to contain_file('/usr/local/bin/dnsmasq').with(
-          :mode   => '0755'
-        )
-        is_expected.to contain_file('/usr/local/bin/dnsmasq').with_content(
-          /a_registry.some_container_name.some_tag/
-        )
-        is_expected.to contain_file('/usr/local/bin/dnsmasq').with_content(
-          /export DOCKER_HOST="unix:...run.another.docker.sock/
-        )
-        is_expected.to contain_file('/usr/local/bin/dnsmasq').with_content(
-          /set -x/
-        )
-        is_expected.to contain_file('/usr/local/bin/dnsmasq').with_content(
-          /CMD="ip netns exec.*\/usr\/sbin\/dnsmasq -k/
-        )
-      end
-    end
-
    context 'creates wrapper file for podman' do
      let(:params) {
        {
--- a/spec/defines/tripleo_profile_base_neutron_wrappers_haproxy_spec.rb
+++ b/spec/defines/tripleo_profile_base_neutron_wrappers_haproxy_spec.rb
@ -24,39 +24,6 @@ describe 'tripleo::profile::base::neutron::wrappers::haproxy' do

  shared_examples_for 'tripleo::profile::base::neutron::wrappers::haproxy' do

-    context 'creates wrapper file for docker' do
-      let(:params) {
-        {
-          :haproxy_process_wrapper  => '/usr/local/bin/haproxy',
-          :haproxy_image            => 'a_registry/some_container_name:some_tag',
-          :bind_socket              => 'unix:///run/another/docker.sock',
-          :container_cli            => 'docker',
-          :debug                    => true,
-        }
-      }
-
-      it 'should generate a wrapper file' do
-        is_expected.to contain_file('/usr/local/bin/haproxy').with(
-          :mode   => '0755'
-        )
-        is_expected.to contain_file('/usr/local/bin/haproxy').with_content(
-          /a_registry.some_container_name.some_tag/
-        )
-        is_expected.to contain_file('/usr/local/bin/haproxy').with_content(
-          /^NAME=neutron-haproxy-/
-        )
-        is_expected.to contain_file('/usr/local/bin/haproxy').with_content(
-          /export DOCKER_HOST="unix:...run.another.docker.sock/
-        )
-        is_expected.to contain_file('/usr/local/bin/haproxy').with_content(
-          /set -x/
-        )
-        is_expected.to contain_file('/usr/local/bin/haproxy').with_content(
-          /.*haproxy -Ds.*haproxy -Ws.*/
-        )
-      end
-    end
-
    context 'creates wrapper file for podman' do
      let(:params) {
        {
--- a/spec/defines/tripleo_profile_base_neutron_wrappers_keepalived_spec.rb
+++ b/spec/defines/tripleo_profile_base_neutron_wrappers_keepalived_spec.rb
@ -24,36 +24,6 @@ describe 'tripleo::profile::base::neutron::wrappers::keepalived' do

  shared_examples_for 'tripleo::profile::base::neutron::wrappers::keepalived' do

-    context 'creates wrapper file for docker' do
-      let(:params) {
-        {
-          :keepalived_process_wrapper  => '/usr/local/bin/keepalived',
-          :keepalived_image            => 'a_registry/some_container_name:some_tag',
-          :bind_socket                 => 'unix:///run/another/docker.sock',
-          :container_cli               => 'docker',
-          :debug                       => true,
-        }
-      }
-
-      it 'should generate a wrapper file' do
-        is_expected.to contain_file('/usr/local/bin/keepalived').with(
-          :mode   => '0755'
-        )
-        is_expected.to contain_file('/usr/local/bin/keepalived').with_content(
-          /a_registry.some_container_name.some_tag/
-        )
-        is_expected.to contain_file('/usr/local/bin/keepalived').with_content(
-          /export DOCKER_HOST="unix:...run.another.docker.sock/
-        )
-        is_expected.to contain_file('/usr/local/bin/keepalived').with_content(
-          /set -x/
-        )
-        is_expected.to contain_file('/usr/local/bin/keepalived').with_content(
-          /CMD="ip netns exec.*\/usr\/sbin\/keepalived -n -l -D/
-        )
-      end
-    end
-
    context 'creates wrapper file for podman' do
      let(:params) {
        {
--- a/spec/defines/tripleo_profile_base_neutron_wrappers_keepalived_state_change_spec.rb
+++ b/spec/defines/tripleo_profile_base_neutron_wrappers_keepalived_state_change_spec.rb
@ -24,32 +24,6 @@ describe 'tripleo::profile::base::neutron::wrappers::keepalived_state_change' do

  shared_examples_for 'tripleo::profile::base::neutron::wrappers::keepalived_state_change' do

-    context 'creates wrapper file for docker' do
-      let(:params) {
-        {
-          :keepalived_state_change_wrapper  => '/usr/local/bin/keepalived-state-change',
-          :bind_socket                      => 'unix:///run/another/docker.sock',
-          :container_cli                    => 'docker',
-          :debug                            => true,
-        }
-      }
-
-      it 'should generate a wrapper file' do
-        is_expected.to contain_file('/usr/local/bin/keepalived-state-change').with(
-          :mode   => '0755'
-        )
-        is_expected.to contain_file('/usr/local/bin/keepalived-state-change').with_content(
-          /export DOCKER_HOST="unix:...run.another.docker.sock/
-        )
-        is_expected.to contain_file('/usr/local/bin/keepalived-state-change').with_content(
-          /set -x/
-        )
-        is_expected.to contain_file('/usr/local/bin/keepalived-state-change').with_content(
-          /CMD="ip netns exec.*\/usr\/bin\/neutron-keepalived-state-change/
-        )
-      end
-    end
-
    context 'creates wrapper file for podman' do
      let(:params) {
        {
--- a/spec/defines/tripleo_profile_base_neutron_wrappers_radvd_spec.rb
+++ b/spec/defines/tripleo_profile_base_neutron_wrappers_radvd_spec.rb
@ -24,39 +24,6 @@ describe 'tripleo::profile::base::neutron::wrappers::radvd' do

  shared_examples_for 'tripleo::profile::base::neutron::wrappers::radvd' do

-    context 'creates wrapper file for docker' do
-      let(:params) {
-        {
-          :radvd_process_wrapper  => '/usr/local/bin/radvd',
-          :radvd_image            => 'a_registry/some_container_name:some_tag',
-          :bind_socket            => 'unix:///run/another/docker.sock',
-          :container_cli          => 'docker',
-          :debug                  => true,
-        }
-      }
-
-      it 'should generate a wrapper file' do
-        is_expected.to contain_file('/usr/local/bin/radvd').with(
-          :mode   => '0755'
-        )
-        is_expected.to contain_file('/usr/local/bin/radvd').with_content(
-          /a_registry.some_container_name.some_tag/
-        )
-        is_expected.to contain_file('/usr/local/bin/radvd').with_content(
-          /^NAME=neutron-radvd-/
-        )
-        is_expected.to contain_file('/usr/local/bin/radvd').with_content(
-          /export DOCKER_HOST="unix:...run.another.docker.sock/
-        )
-        is_expected.to contain_file('/usr/local/bin/radvd').with_content(
-          /set -x/
-        )
-        is_expected.to contain_file('/usr/local/bin/radvd').with_content(
-          /CMD="ip netns exec.*\/usr\/sbin\/radvd -n/
-        )
-      end
-    end
-
    context 'creates wrapper file for podman' do
      let(:params) {
        {
--- a/templates/neutron/dibbler-client.epp
+++ b/templates/neutron/dibbler-client.epp
@ -1,14 +1,10 @@
 <%- | String  $image_name    = '',
-      String  $bind_socket   = '',
      Boolean $debug,
      String  $container_cli = ''
 | -%>
 #!/bin/bash
 <%- if $debug { -%>set -x<%- } -%>

-<%- if $bind_socket { -%>
-export DOCKER_HOST="<%=$bind_socket%>"
-<%- } -%>
 # we want to "eat" the "start" command given by neutron and run
 # this in the foreground.
 shift
@ -22,11 +18,7 @@ ARGS="$@"
 #   --dhcp-hostsfile=/var/lib/neutron/dhcp/317716b8-919a-4a6f-8db1-78128ec3b100/host ...
 NETNS=$(ip netns identify)
 NAME=neutron-dibbler-${NETNS}
-<%- if $container_cli == 'docker' { -%>
-CLI='docker'
-LOGGING=''
-CMD="ip netns exec ${NETNS} /usr/sbin/dibbler-client run"
-<%- } elsif $container_cli == 'podman' { -%>
+<%- if $container_cli == 'podman' { -%>
 CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman"
 LOGGING="--log-driver k8s-file --log-opt path=/var/log/containers/stdouts/${NAME}.log"
 CMD='/usr/sbin/dibbler-client run'
--- a/templates/neutron/dnsmasq.epp
+++ b/templates/neutron/dnsmasq.epp
@ -1,14 +1,10 @@
 <%- | String  $image_name    = '',
-      String  $bind_socket   = '',
      Boolean $debug,
      String  $container_cli = ''
 | -%>
 #!/bin/bash
 <%- if $debug { -%>set -x<%- } -%>

-<%- if $bind_socket { -%>
-export DOCKER_HOST="<%=$bind_socket%>"
-<%- } -%>
 ARGS="$@"

 # Extract the network namespace UUID from the command line args provided by
@ -19,11 +15,7 @@ ARGS="$@"
 #   --dhcp-hostsfile=/var/lib/neutron/dhcp/317716b8-919a-4a6f-8db1-78128ec3b100/host ...
 NETNS=$(ip netns identify)
 NAME=neutron-dnsmasq-${NETNS}
-<%- if $container_cli == 'docker' { -%>
-CLI='docker'
-LOGGING=''
-CMD="ip netns exec ${NETNS} /usr/sbin/dnsmasq -k"
-<%- } elsif $container_cli == 'podman' { -%>
+<%- if $container_cli == 'podman' { -%>
 CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman"
 LOGGING="--log-driver k8s-file --log-opt path=/var/log/containers/stdouts/${NAME}.log"
 CMD='/usr/sbin/dnsmasq -k'
--- a/templates/neutron/haproxy.epp
+++ b/templates/neutron/haproxy.epp
@ -1,14 +1,10 @@
 <%- | String  $image_name    = '',
-      String  $bind_socket   = '',
      Boolean $debug,
      String  $container_cli = ''
 | -%>
 #!/bin/bash
 <%- if $debug { -%>set -x<%- } -%>

-<%- if $bind_socket { -%>
-export DOCKER_HOST="<%=$bind_socket%>"
-<%- } -%>
 ARGS="$@"

 # Extract the network namespace UUID from the command line args provided by
@ -20,11 +16,7 @@ ARGS="$@"
 NETNS=$(ip netns identify)
 NAME=neutron-haproxy-${NETNS}
 HAPROXY_CMD='$(if [ -f /usr/sbin/haproxy-systemd-wrapper ]; then echo "/usr/sbin/haproxy -Ds"; else echo "/usr/sbin/haproxy -Ws"; fi)'
-<%- if $container_cli == 'docker' { -%>
-CLI='docker'
-LOGGING=''
-CMD="ip netns exec ${NETNS} "'$HAPROXY'
-<%- } elsif $container_cli == 'podman' { -%>
+<%- if $container_cli == 'podman' { -%>
 CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman"
 LOGGING="--log-driver k8s-file --log-opt path=/var/log/containers/stdouts/${NAME}.log"
 CMD='$HAPROXY'
--- a/templates/neutron/keepalived.epp
+++ b/templates/neutron/keepalived.epp
@ -1,14 +1,10 @@
 <%- | String  $image_name    = '',
-      String  $bind_socket   = '',
      Boolean $debug,
      String  $container_cli = ''
 | -%>
 #!/bin/bash
 <%- if $debug { -%>set -x<%- } -%>

-<%- if $bind_socket { -%>
-export DOCKER_HOST="<%=$bind_socket%>"
-<%- } -%>
 ARGS="$@"

 # Extract the network namespace UUID from the command line args provided by
@ -19,11 +15,7 @@ ARGS="$@"
 #   --dhcp-hostsfile=/var/lib/neutron/dhcp/317716b8-919a-4a6f-8db1-78128ec3b100/host ...
 NETNS=$(ip netns identify)
 NAME=neutron-keepalived-${NETNS}
-<%- if $container_cli == 'docker' { -%>
-CLI='docker'
-LOGGING=''
-CMD="ip netns exec ${NETNS} /usr/sbin/keepalived -n -l -D"
-<%- } elsif $container_cli == 'podman' { -%>
+<%- if $container_cli == 'podman' { -%>
 CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman"
 LOGGING="--log-driver k8s-file --log-opt path=/var/log/containers/stdouts/${NAME}.log"
 CMD='/usr/sbin/keepalived -n -l -D'
--- a/templates/neutron/neutron-keepalived-state-change.epp
+++ b/templates/neutron/neutron-keepalived-state-change.epp
@ -1,13 +1,9 @@
-<%- | String  $bind_socket   = '',
-      Boolean $debug,
+<%- | Boolean $debug,
      String  $container_cli = ''
 | -%>
 #!/bin/bash
 <%- if $debug { -%>set -x<%- } -%>

-<%- if $bind_socket { -%>
-export DOCKER_HOST="<%=$bind_socket%>"
-<%- } -%>
 ARGS="$@"

 # Extract the network namespace UUID from the command line args provided by
@ -18,10 +14,7 @@ ARGS="$@"
 #   --dhcp-hostsfile=/var/lib/neutron/dhcp/317716b8-919a-4a6f-8db1-78128ec3b100/host ...
 NETNS=$(ip netns identify)
 NAME=neutron-keepalived-${NETNS}
-<%- if $container_cli == 'docker' { -%>
-CLI='docker exec --detach'
-CMD="ip netns exec ${NETNS} /usr/bin/neutron-keepalived-state-change exec"
-<%- } elsif $container_cli == 'podman' { -%>
+<%- if $container_cli == 'podman' { -%>
 CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman exec"
 CMD='/usr/bin/neutron-keepalived-state-change'
 <%- } else { -%>
--- a/templates/neutron/radvd.epp
+++ b/templates/neutron/radvd.epp
@ -1,14 +1,10 @@
 <%- | String  $image_name    = '',
-      String  $bind_socket   = '',
      Boolean $debug,
      String  $container_cli = ''
 | -%>
 #!/bin/bash
 <%- if $debug { -%>set -x<%- } -%>

-<%- if $bind_socket { -%>
-export DOCKER_HOST="<%=$bind_socket%>"
-<%- } -%>
 ARGS="$@"

 # Extract the network namespace UUID from the command line args provided by
@ -19,11 +15,7 @@ ARGS="$@"
 #   --dhcp-hostsfile=/var/lib/neutron/dhcp/317716b8-919a-4a6f-8db1-78128ec3b100/host ...
 NETWORK_ID=$(echo $ARGS| awk '{if (match($0, /(\w{8}-\w{4}-\w{4}-\w{4}-\w{12})/,m)) print m[0] }')
 NAME=neutron-radvd-${NETWORK_ID}
-<%- if $container_cli == 'docker' { -%>
-CLI='docker'
-LOGGING=''
-CMD="ip netns exec qrouter-${NETWORK_ID} /usr/sbin/radvd -n"
-<%- } elsif $container_cli == 'podman' { -%>
+<%- if $container_cli == 'podman' { -%>
 CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman"
 LOGGING="--log-driver k8s-file --log-opt path=/var/log/containers/stdouts/${NAME}.log"
 CMD='/usr/sbin/radvd -n'