From 41444280b4c9d4ca7d472efd0758efca4871c142 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl> Date: Wed, 26 Sep 2018 11:14:43 +0200 Subject: [PATCH] Contain classes This is the current way of containing classes --- manifests/agent.pp | 10 +++++----- manifests/init.pp | 9 +++------ manifests/server.pp | 12 +++++++----- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/manifests/agent.pp b/manifests/agent.pp index 689e282d..139c0ab3 100644 --- a/manifests/agent.pp +++ b/manifests/agent.pp @@ -1,9 +1,9 @@ # Puppet agent class puppet::agent { - class { '::puppet::agent::install': } - -> class { '::puppet::agent::config': } - ~> class { '::puppet::agent::service': } - -> Class['::puppet::agent'] + contain puppet::agent::install + contain puppet::agent::config + contain puppet::agent::service - Class['puppet::config'] ~> Class['puppet::agent::service'] + Class['puppet::agent::install'] ~> Class['puppet::agent::config'] + Class['puppet::config', 'puppet::agent::config'] ~> Class['puppet::agent::service'] } diff --git a/manifests/init.pp b/manifests/init.pp index 63ad6623..131c2172 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -736,17 +736,14 @@ Array[String] $server_puppetserver_trusted_agents = $puppet::params::server_puppetserver_trusted_agents, Optional[Enum['off', 'jit', 'force']] $server_compile_mode = $puppet::params::server_compile_mode, ) inherits puppet::params { - include ::puppet::config - Class['puppet::config'] -> Class['puppet'] + contain puppet::config if $agent == true { - include ::puppet::agent - Class['puppet::agent'] -> Class['puppet'] + contain puppet::agent } if $server == true { - include ::puppet::server - Class['puppet::server'] -> Class['puppet'] + contain puppet::server } # Ensure the server is running before the agent needs it, and that diff --git a/manifests/server.pp b/manifests/server.pp index 242c3703..eff012c6 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -498,16 +498,18 @@ $rack_service = false } - class { '::puppet::server::install': } - ~> class { '::puppet::server::config': } - ~> class { '::puppet::server::service': + class { 'puppet::server::service': app_root => $app_root, httpd_service => $httpd_service, puppetmaster => $pm_service, puppetserver => $ps_service, rack => $rack_service, } - -> Class['puppet::server'] - Class['puppet::config'] ~> Class['puppet::server::service'] + contain puppet::server::install + contain puppet::server::config + contain puppet::server::service + + Class['puppet::server::install'] ~> Class['puppet::server::config'] + Class['puppet::config', 'puppet::server::config'] ~> Class['puppet::server::service'] }