From af5e96c41e886b72e0800e3efdb0b741b41eb7d2 Mon Sep 17 00:00:00 2001 From: Zachary Dovel Date: Mon, 11 May 2015 18:01:09 -0700 Subject: [PATCH 1/8] Made more configurable --- manifests/install.pp | 8 +++++--- manifests/params.pp | 3 +++ manifests/service.pp | 12 +++++++----- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/manifests/install.pp b/manifests/install.pp index 387c77f..c25ba1f 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -3,8 +3,10 @@ # Installs supervisor package (defaults to using pip) # class supervisord::install inherits supervisord { - package { $supervisord::package_name: - ensure => $supervisord::package_ensure, - provider => $supervisord::package_provider + if $supervisord::package_manage == true { + package { $supervisord::package_name: + ensure => $supervisord::package_ensure, + provider => $supervisord::package_provider + } } } diff --git a/manifests/params.pp b/manifests/params.pp index d00b51e..4b92456 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -26,8 +26,11 @@ # default supervisord params $package_ensure = 'installed' + $package_enable = true + $package_manage = true $package_provider = 'pip' $service_ensure = 'running' + $service_manage = true $service_name = 'supervisord' $package_name = 'supervisor' $executable = "${executable_path}/supervisord" diff --git a/manifests/service.pp b/manifests/service.pp index f02a0d0..39b048e 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -3,10 +3,12 @@ # Class for the supervisord service # class supervisord::service inherits supervisord { - service { $supervisord::service_name: - ensure => $supervisord::service_ensure, - enable => true, - hasrestart => true, - hasstatus => true + if $supervisord::service_manage == true { + service { $supervisord::service_name: + ensure => $supervisord::service_ensure, + enable => $supervisord::service_enable, + hasrestart => true, + hasstatus => true + } } } From 8cf1b39bf38e73da14b5ed5343f8bfa69d26d3e8 Mon Sep 17 00:00:00 2001 From: Zachary Dovel Date: Mon, 11 May 2015 18:10:56 -0700 Subject: [PATCH 2/8] Updates --- manifests/init.pp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index fa396da..9aee22e 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -5,8 +5,11 @@ class supervisord( $package_ensure = $supervisord::params::package_ensure, $package_name = $supervisord::params::package_name, + $package_enable = $supervisord::params::package_enable, + $package_manage = $supervisord::params::package_manage, $package_provider = $supervisord::params::package_provider, $service_ensure = $supervisord::params::service_ensure, + $service_manage = $supervisord::params::service_manage, $service_name = $supervisord::params::service_name, $install_init = $supervisord::params::install_init, $install_pip = false, @@ -123,7 +126,13 @@ Class['supervisord::pip'] -> Class['supervisord::install'] } - include supervisord::install, supervisord::config, supervisord::service, supervisord::reload + include supervisord::config, supervisord::reload + if $package_manage == true { + include supervisord::install + } + if $service_manage == true { + include supervisord::service + } Class['supervisord::install'] -> Class['supervisord::config'] ~> Class['supervisord::service'] Class['supervisord::reload'] -> Supervisord::Supervisorctl <| |> From aafba08d5584b233e06fa7c967f4c94a20024c22 Mon Sep 17 00:00:00 2001 From: Zachary Dovel Date: Mon, 11 May 2015 18:33:34 -0700 Subject: [PATCH 3/8] bug fixes --- manifests/service.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/service.pp b/manifests/service.pp index 39b048e..95d161f 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -6,7 +6,7 @@ if $supervisord::service_manage == true { service { $supervisord::service_name: ensure => $supervisord::service_ensure, - enable => $supervisord::service_enable, + enable => $supervisord::package_enable, hasrestart => true, hasstatus => true } From 82854a79aa6d113248fc49bd2126c43eb693d5e9 Mon Sep 17 00:00:00 2001 From: Zachary Dovel Date: Mon, 11 May 2015 18:35:55 -0700 Subject: [PATCH 4/8] fixes --- manifests/service.pp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/manifests/service.pp b/manifests/service.pp index 95d161f..5df22d6 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -11,4 +11,12 @@ hasstatus => true } } + else { + service { $supervisord::service_name: + ensure => stopped, + enable => false, + hasrestart => false, + hasstatus => false, + } + } } From 897e0c04c1841b42006d2c16e11dd49bfb733ca4 Mon Sep 17 00:00:00 2001 From: Zachary Dovel Date: Mon, 11 May 2015 18:37:02 -0700 Subject: [PATCH 5/8] Fixes --- manifests/service.pp | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/manifests/service.pp b/manifests/service.pp index 5df22d6..010805f 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -3,20 +3,10 @@ # Class for the supervisord service # class supervisord::service inherits supervisord { - if $supervisord::service_manage == true { - service { $supervisord::service_name: - ensure => $supervisord::service_ensure, - enable => $supervisord::package_enable, - hasrestart => true, - hasstatus => true - } - } - else { - service { $supervisord::service_name: - ensure => stopped, - enable => false, - hasrestart => false, - hasstatus => false, - } + service { $supervisord::service_name: + ensure => $supervisord::service_ensure, + enable => $supervisord::package_enable, + hasrestart => true, + hasstatus => true } } From 470e631565e92ee310d7192a30aa343f142de1e6 Mon Sep 17 00:00:00 2001 From: Zachary Dovel Date: Mon, 11 May 2015 18:38:33 -0700 Subject: [PATCH 6/8] fixes --- manifests/init.pp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 9aee22e..b47db98 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -126,13 +126,7 @@ Class['supervisord::pip'] -> Class['supervisord::install'] } - include supervisord::config, supervisord::reload - if $package_manage == true { - include supervisord::install - } - if $service_manage == true { - include supervisord::service - } + include supervisord::config, supervisord::reload, supervisord::install, supervisord::service Class['supervisord::install'] -> Class['supervisord::config'] ~> Class['supervisord::service'] Class['supervisord::reload'] -> Supervisord::Supervisorctl <| |> From c7588e8a19b85c911fb28defba976fd5071dadf0 Mon Sep 17 00:00:00 2001 From: Zachary Dovel Date: Mon, 11 May 2015 18:40:51 -0700 Subject: [PATCH 7/8] Fixes --- manifests/service.pp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/manifests/service.pp b/manifests/service.pp index 010805f..95d161f 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -3,10 +3,12 @@ # Class for the supervisord service # class supervisord::service inherits supervisord { - service { $supervisord::service_name: - ensure => $supervisord::service_ensure, - enable => $supervisord::package_enable, - hasrestart => true, - hasstatus => true + if $supervisord::service_manage == true { + service { $supervisord::service_name: + ensure => $supervisord::service_ensure, + enable => $supervisord::package_enable, + hasrestart => true, + hasstatus => true + } } } From ad127580e7439eb1d93d2b8fcabeac1cef5600ca Mon Sep 17 00:00:00 2001 From: Zachary Dovel Date: Mon, 11 May 2015 18:49:24 -0700 Subject: [PATCH 8/8] fixes --- manifests/reload.pp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/manifests/reload.pp b/manifests/reload.pp index 79eca3d..1897f4a 100644 --- a/manifests/reload.pp +++ b/manifests/reload.pp @@ -6,14 +6,16 @@ $supervisorctl = $::supervisord::executable_ctl - exec { 'supervisorctl_reread': - command => "${supervisorctl} reread", - refreshonly => true, - require => Service[$supervisord::service_name], - } - exec { 'supervisorctl_update': - command => "${supervisorctl} update", - refreshonly => true, - require => Service[$supervisord::service_name], + if $supervisord::service_manage == true { + exec { 'supervisorctl_reread': + command => "${supervisorctl} reread", + refreshonly => true, + require => Service[$supervisord::service_name], + } + exec { 'supervisorctl_update': + command => "${supervisorctl} update", + refreshonly => true, + require => Service[$supervisord::service_name], + } } }