commit 0405a5529d7080944096061742be7c9a4684e50e
Author: Jerry Sun <jerry.sun@windriver.com>
Date:   Wed Oct 7 12:29:21 2020 -0400

    Replace containerd Sysinv credentials with mtce credentials
    
    Sysinv credentials in the containerd config allowed kubernetes to
    deploy images without pull secrets. We replace the credentials with
    "mtce" user's credentials. The "mtce" user is treated as a public
    user and is not allowed to deploy non-public images.
    
    Closes-Bug: 1894930
    Depends-On: https://review.opendev.org/756557
    
    Change-Id: I4a33c6aba50d98d42ef91c75bfc9c148d4ebd9fd
    Signed-off-by: Jerry Sun <jerry.sun@windriver.com>

diff --git a/puppet-manifests/src/modules/platform/manifests/containerd.pp b/puppet-manifests/src/modules/platform/manifests/containerd.pp
index 747f0c6..5ba9777 100644
--- a/puppet-manifests/src/modules/platform/manifests/containerd.pp
+++ b/puppet-manifests/src/modules/platform/manifests/containerd.pp
@@ -17,6 +17,7 @@ class platform::containerd::config
   include ::platform::kubernetes::params
   include ::platform::dockerdistribution::registries
   include ::platform::params
+  include ::platform::mtce::params
 
   # If containerd is started prior to networking providing a default route, the
   # containerd cri plugin will fail to load and the status of the cri plugin
@@ -66,8 +67,8 @@ class platform::containerd::config
   # generate the registry auth
   $registry_auth = chomp(
     base64('encode',
-      join([$::platform::dockerdistribution::params::registry_username,
-            $::platform::dockerdistribution::params::registry_password], ':')))
+      join([$::platform::mtce::params::auth_username,
+            $::platform::mtce::params::auth_pw], ':')))
 
   if $::platform::network::mgmt::params::subnet_version == $::platform::params::ipv6 {
     $stream_server_address = '::1'