starlingx
/
stx-puppet
Code Issues Proposed changes

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>
This commit is contained in:
Paul Vaduva 2020-04-02 13:06:57 +03:00
parent 07edad67cc
commit 93d22c438e
5 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
puppet-manifests/src/manifests/controller.pp
View File

@ -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

4
puppet-manifests/src/manifests/storage.pp
View File

@ -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':

4
puppet-manifests/src/manifests/worker.pp
View File

@ -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

17
puppet-manifests/src/modules/platform/manifests/containerd.pp
View File

@ -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
}
}

18
puppet-manifests/src/modules/platform/manifests/docker.pp
View File

@ -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 {