From 93d22c438ed6939bd4b1723b37e23794eacb7006 Mon Sep 17 00:00:00 2001
From: Paul Vaduva <Paul.Vaduva@windriver.com>
Date: Thu, 2 Apr 2020 13:06:57 +0300
Subject: [PATCH] Configure docker and containerd once per AIO deploy

Prevent a double configuration of docker and containerd
for AIO scenarios.

Change-Id: I0cb9fdde5acf8d5d44d526e70ae4af726932709f
Closes-bug: 1869193
Signed-off-by: Paul Vaduva <Paul.Vaduva@windriver.com>
---
 puppet-manifests/src/manifests/controller.pp   |  4 ++--
 puppet-manifests/src/manifests/storage.pp      |  4 ++--
 puppet-manifests/src/manifests/worker.pp       |  4 ++--
 .../modules/platform/manifests/containerd.pp   | 17 ++++++++++++++++-
 .../src/modules/platform/manifests/docker.pp   | 18 +++++++++++++++++-
 5 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/puppet-manifests/src/manifests/controller.pp b/puppet-manifests/src/manifests/controller.pp
index eeba6f8cb..c93caa538 100644
--- a/puppet-manifests/src/manifests/controller.pp
+++ b/puppet-manifests/src/manifests/controller.pp
@@ -40,9 +40,9 @@ include ::platform::postgresql::server
 include ::platform::haproxy::server
 include ::platform::grub
 include ::platform::etcd
-include ::platform::docker
+include ::platform::docker::controller
 include ::platform::dockerdistribution
-include ::platform::containerd
+include ::platform::containerd::controller
 include ::platform::kubernetes::master
 include ::platform::helm
 
diff --git a/puppet-manifests/src/manifests/storage.pp b/puppet-manifests/src/manifests/storage.pp
index c9a2edfcc..17d42cdf7 100644
--- a/puppet-manifests/src/manifests/storage.pp
+++ b/puppet-manifests/src/manifests/storage.pp
@@ -27,8 +27,8 @@ include ::platform::sysinv
 include ::platform::grub
 include ::platform::collectd
 include ::platform::filesystem::storage
-include ::platform::docker
-include ::platform::containerd
+include ::platform::docker::storage
+include ::platform::containerd::storage
 include ::platform::ceph::storage
 
 class { '::platform::config::storage::post':
diff --git a/puppet-manifests/src/manifests/worker.pp b/puppet-manifests/src/manifests/worker.pp
index 6caa9945a..3490aa5b9 100644
--- a/puppet-manifests/src/manifests/worker.pp
+++ b/puppet-manifests/src/manifests/worker.pp
@@ -30,8 +30,8 @@ include ::platform::devices
 include ::platform::grub
 include ::platform::collectd
 include ::platform::filesystem::compute
-include ::platform::docker
-include ::platform::containerd
+include ::platform::docker::worker
+include ::platform::containerd::worker
 include ::platform::dockerdistribution::compute
 include ::platform::kubernetes::worker
 include ::platform::multipath
diff --git a/puppet-manifests/src/modules/platform/manifests/containerd.pp b/puppet-manifests/src/modules/platform/manifests/containerd.pp
index eca2f4983..0691051af 100644
--- a/puppet-manifests/src/modules/platform/manifests/containerd.pp
+++ b/puppet-manifests/src/modules/platform/manifests/containerd.pp
@@ -91,9 +91,24 @@ class platform::containerd::install
   }
 }
 
-class platform::containerd
+class platform::containerd::controller
 {
   include ::platform::containerd::install
   include ::platform::containerd::config
 }
 
+class platform::containerd::worker
+{
+  if $::personality != 'controller' {
+    include ::platform::containerd::install
+    include ::platform::containerd::config
+  }
+}
+
+class platform::containerd::storage
+{
+  if $::personality != 'controller' {
+    include ::platform::containerd::install
+    include ::platform::containerd::config
+  }
+}
diff --git a/puppet-manifests/src/modules/platform/manifests/docker.pp b/puppet-manifests/src/modules/platform/manifests/docker.pp
index 69e203d2d..03a2d7041 100644
--- a/puppet-manifests/src/modules/platform/manifests/docker.pp
+++ b/puppet-manifests/src/modules/platform/manifests/docker.pp
@@ -63,12 +63,28 @@ class platform::docker::install
   }
 }
 
-class platform::docker
+class platform::docker::controller
 {
   include ::platform::docker::install
   include ::platform::docker::config
 }
 
+class platform::docker::worker
+{
+  if $::personality != 'controller' {
+    include ::platform::docker::install
+    include ::platform::docker::config
+  }
+}
+
+class platform::docker::storage
+{
+  if $::personality != 'controller' {
+    include ::platform::docker::install
+    include ::platform::docker::config
+  }
+}
+
 class platform::docker::config::bootstrap
   inherits ::platform::docker::params {