Fix site-packages path for python 2.7
CentOS7 comes with python2.7 included, so we need to update path to site-packages directory Blueprint: master-on-centos7 Compatible with CentOS6 & CentOS7 master node Change-Id: Ifa7026ef5e090d740797567e99dae0f08e41c310
This commit is contained in:
parent
715085df55
commit
1fe00b4019
@ -6,8 +6,20 @@
|
||||
#
|
||||
class nailgun::uwsgi(
|
||||
$production,
|
||||
$venv = '/usr',
|
||||
) {
|
||||
|
||||
if $::osfamily == 'RedHat' {
|
||||
case $operatingsystemmajrelease {
|
||||
'6': {
|
||||
$site_packages_path = inline_template("<%= @venv %>/lib/python2.6/site-packages")
|
||||
}
|
||||
'7': {
|
||||
$site_packages_path = inline_template("<%= @venv %>/lib/python2.7/site-packages")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if $::physicalprocessorcount > 4 {
|
||||
$physicalprocessorcount = 8
|
||||
} else {
|
||||
|
@ -6,7 +6,7 @@ uwsgi:
|
||||
socket: :8001
|
||||
plugin: python
|
||||
chown-socket: nginx:nginx
|
||||
pythonpath: <%= @venv %>/lib/python2.6/site-packages/nailgun
|
||||
pythonpath: <%= @site_packages_path %>/nailgun
|
||||
touch-reload: /var/lib/nailgun-uwsgi
|
||||
virtualenv: <%= @venv %>
|
||||
module: nailgun.wsgi
|
||||
@ -16,4 +16,4 @@ uwsgi:
|
||||
logto: /var/log/nailgun/app.log
|
||||
mule: 1
|
||||
lazy: true
|
||||
shared-pyimport: <%= @venv %>/lib/python2.6/site-packages/nailgun/utils/mule.py
|
||||
shared-pyimport: <%= @site_packages_path %>/nailgun/utils/mule.py
|
||||
|
Loading…
Reference in New Issue
Block a user