summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Lawrence <dannyla@linux.com>2013-11-29 09:16:31 +1100
committerDaniel Lawrence <dannyla@linux.com>2013-11-29 09:16:31 +1100
commit04bffc411afb19a572af34d1a2e0f7029f16dfe4 (patch)
tree6f50df19414e199a6df9a142abb0e8275eca0dcd
parent725cf0d480b73abd53c8b4d31dc6b3190188ca74 (diff)
Added manage_gunicorn flag.
This will allow a user to stop the module from trying to do anything with gunicorn.
-rw-r--r--manifests/config.pp21
-rw-r--r--manifests/init.pp9
-rw-r--r--manifests/install.pp11
3 files changed, 22 insertions, 19 deletions
diff --git a/manifests/config.pp b/manifests/config.pp
index 49e5230..fdd808f 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -6,18 +6,19 @@ class python::config {
Python::Virtualenv <| |> -> Python::Pip <| |>
- if $python::gunicorn {
- Class['python::install'] -> Python::Gunicorn <| |>
+ if $python::manage_gunicorn {
+ if $python::gunicorn {
+ Class['python::install'] -> Python::Gunicorn <| |>
- Python::Gunicorn <| |> ~> Service['gunicorn']
+ Python::Gunicorn <| |> ~> Service['gunicorn']
- service { 'gunicorn':
- ensure => running,
- enable => true,
- hasrestart => true,
- hasstatus => false,
- pattern => '/usr/bin/gunicorn',
+ service { 'gunicorn':
+ ensure => running,
+ enable => true,
+ hasrestart => true,
+ hasstatus => false,
+ pattern => '/usr/bin/gunicorn',
+ }
}
}
-
}
diff --git a/manifests/init.pp b/manifests/init.pp
index c4e469d..574573b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -35,10 +35,11 @@
#
class python (
$version = 'system',
- $pip = false,
- $dev = false,
- $virtualenv = false,
- $gunicorn = false
+ $pip = false,
+ $dev = false,
+ $virtualenv = false,
+ $gunicorn = false,
+ $manage_gunicorn = false
) {
# Module compatibility check
diff --git a/manifests/install.pp b/manifests/install.pp
index 415092e..caead49 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -32,11 +32,12 @@ class python::install {
package { 'python-virtualenv': ensure => $venv_ensure }
- $gunicorn_ensure = $python::gunicorn ? {
- true => present,
- default => absent,
+ if $python::manage_gunicorn {
+ $gunicorn_ensure = $python::gunicorn ? {
+ true => present,
+ default => absent,
+ }
+ package { 'gunicorn': ensure => $gunicorn_ensure }
}
- package { 'gunicorn': ensure => $gunicorn_ensure }
-
}