Merge pull request voxpupuli#2 from mfournier/gunicorn_and_virtualenv_additions

stankevich · stankevich · commit 94d9ca52b531 · 2012-11-06T13:01:55.000-08:00
Gunicorn and virtualenv additions
diff --git a/README.md b/README.md
@@ -64,11 +64,14 @@ Creates Python virtualenv.
 
 **proxy** — Proxy server to use for outbound connections. Default: none
 
+**systempkgs** — Copy system site-packages into virtualenv. Default: don't
+
 	python::virtualenv { '/var/www/project1':
 	  ensure       => present,
 	  version      => 'system',
 	  requirements => '/var/www/project1/requirements.txt',
 	  proxy        => 'http://proxy.domain.com:3128',
+	  systempkgs   => true,
 	}
 
 ### python::gunicorn
@@ -87,15 +90,20 @@ Manages Gunicorn virtual hosts.
 
 **environment** — Set ENVIRONMENT variable. Default: none
 
+**template** — Which ERB template to use. Default: python/gunicorn.erb
+
 	python::gunicorn { 'vhost':
 	  ensure      => present,
 	  virtualenv  => '/var/www/project1',
 	  mode        => 'wsgi',
 	  dir         => '/var/www/project1/current',
 	  bind        => 'unix:/tmp/gunicorn.socket',
 	  environment => 'prod',
+	  template    => 'python/gunicorn.erb',
 	}
 
 ## Authors
 
 [Sergey Stankevich](https://github.com/stankevich)
+[Ashley Penney](https://github.com/apenney)
+[Marc Fournier](https://github.com/mfournier)
diff --git a/manifests/gunicorn.pp b/manifests/gunicorn.pp
@@ -25,6 +25,9 @@
 # [*environment*]
 #  Set ENVIRONMENT variable. Default: none
 #
+# [*template*]
+#  Which ERB template to use. Default: python/gunicorn.erb
+#
 # === Examples
 #
 # python::gunicorn { 'vhost':
@@ -34,20 +37,23 @@
 #   dir         => '/var/www/project1/current',
 #   bind        => 'unix:/tmp/gunicorn.socket',
 #   environment => 'prod',
+#   template    => 'python/gunicorn.erb',
 # }
 #
 # === Authors
 #
 # Sergey Stankevich
+# Ashley Penney
+# Marc Fournier
 #
 define python::gunicorn (
   $ensure        = present,
   $virtualenv    = false,
   $mode          = 'wsgi',
   $dir           = false,
   $bind          = false,
-  $app_interface = 'wsgi',
   $environment   = false,
+  $template      = 'python/gunicorn.erb',
 ) {
 
   # Parameter validation
@@ -60,7 +66,7 @@
     mode    => '0644',
     owner   => 'root',
     group   => 'root',
-    content => template('python/gunicorn.erb'),
+    content => template($template),
   }
 
 }
diff --git a/manifests/requirements.pp b/manifests/requirements.pp
@@ -20,6 +20,7 @@
 # === Authors
 #
 # Sergey Stankevich
+# Ashley Penney
 #
 define python::requirements (
   $virtualenv = 'system',
@@ -38,7 +39,6 @@
     default  => "--proxy=${proxy}",
   }
 
-  $req_dir = inline_template('<%= requirements.match(%r!(.+)/.+!)[1] %>')
   $req_crc = "${requirements}.sha1"
 
   file { $requirements:
diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp
@@ -16,24 +16,31 @@
 # [*proxy*]
 #  Proxy server to use for outbound connections. Default: none
 #
+# [*systempkgs*]
+#  Copy system site-packages into virtualenv. Default: don't
+#
 # === Examples
 #
 # python::virtualenv { '/var/www/project1':
 #   ensure       => present,
 #   version      => 'system',
 #   requirements => '/var/www/project1/requirements.txt',
 #   proxy        => 'http://proxy.domain.com:3128',
+#   systempkgs   => true,
 # }
 #
 # === Authors
 #
 # Sergey Stankevich
+# Ashley Penney
+# Marc Fournier
 #
 define python::virtualenv (
   $ensure       = present,
   $version      = 'system',
   $requirements = false,
-  $proxy        = false
+  $proxy        = false,
+  $systempkgs   = false,
 ) {
 
   $venv_dir = $name
@@ -55,10 +62,15 @@
       default => "&& export http_proxy=${proxy}",
     }
 
+    $system_pkgs_flag = $systempkgs ? {
+      false    => '',
+      default  => '--system-site-packages',
+    }
+
     exec { "python_virtualenv_${venv_dir}":
       command => "mkdir -p ${venv_dir} \
         ${proxy_command} \
-        && virtualenv -p `which ${python}` ${venv_dir} \
+        && virtualenv -p `which ${python}` ${system_pkgs_flag} ${venv_dir} \
         && ${venv_dir}/bin/pip install ${proxy_flag} --upgrade distribute pip",
       creates => $venv_dir,
     }
diff --git a/tests/gunicorn.pp b/tests/gunicorn.pp
@@ -11,4 +11,5 @@
   dir         => '/var/www/project1/current',
   bind        => 'unix:/tmp/gunicorn.socket',
   environment => 'prod',
+  template    => 'python/gunicorn.erb',
 }
diff --git a/tests/virtualenv.pp b/tests/virtualenv.pp
@@ -9,4 +9,5 @@
   version      => 'system',
   requirements => '/var/www/project1/requirements.txt',
   proxy        => 'http://proxy.domain.com:3128',
+  systempkgs   => true,
 }

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`# === Authors`
`21`	`21`	`#`
`22`	`22`	`# Sergey Stankevich`
	`23`	`+# Ashley Penney`
`23`	`24`	`#`
`24`	`25`	`define python::requirements (`
`25`	`26`	`$virtualenv = 'system',`
`@@ -38,7 +39,6 @@`
`38`	`39`	`default => "--proxy=${proxy}",`
`39`	`40`	`}`
`40`	`41`
`41`		`- $req_dir = inline_template('<%= requirements.match(%r!(.+)/.+!)[1] %>')`
`42`	`42`	`$req_crc = "${requirements}.sha1"`
`43`	`43`
`44`	`44`	`file { $requirements:`
Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,5 @@`
`11`	`11`	`dir => '/var/www/project1/current',`
`12`	`12`	`bind => 'unix:/tmp/gunicorn.socket',`
`13`	`13`	`environment => 'prod',`
	`14`	`+ template => 'python/gunicorn.erb',`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,5 @@`
`9`	`9`	`version => 'system',`
`10`	`10`	`requirements => '/var/www/project1/requirements.txt',`
`11`	`11`	`proxy => 'http://proxy.domain.com:3128',`
	`12`	`+ systempkgs => true,`
`12`	`13`	`}`