run hobo in python3 (#40259)

This commit is contained in:
Nicolas Roche 2020-02-28 11:11:58 +01:00 committed by Benjamin Dauvergne
parent d9c98cd4ad
commit de91b87632
6 changed files with 7 additions and 7 deletions

View File

@ -9,7 +9,7 @@
tasks:
- name: "delete hobo tenant"
command: "{{venv_bin}}/{{apps['hobo']['project_name']}}-manage delete_tenant {{tenants_conf['dev-hobo']}}"
command: "{{venv_py3_bin}}/{{apps['hobo']['project_name']}}-manage delete_tenant {{tenants_conf['dev-hobo']}}"
ignore_errors: yes
- name: "delete combo user tenant"

View File

@ -28,7 +28,7 @@
- name: agent script
template:
src: hobo-agent.j2
dest: "{{venv_bin}}/{{agent_dash_name}}"
dest: "{{venv_py3_bin}}/{{agent_dash_name}}"
mode: "u=rwx,g=rx,o=rx"
- name: hobo agent supervisor configuration

View File

@ -13,7 +13,7 @@ AGENT_HOST_PATTERNS = {
WCS_MANAGE_COMMAND = "{{venv_py3_bin}}/wcsctl.py -f {{publik_settings}}/wcs/wcs.cfg"
WCS_MANAGE_TRY_COMMAND = "{{venv_py3_bin}}/wcsctl.py"
{% else %}
{% if appkey in ('bijoe', 'combo', 'chrono', 'fargo', 'passerelle', 'authentic') %}
{% if appkey in ('bijoe', 'combo', 'chrono', 'fargo', 'passerelle', 'authentic', 'hobo') %}
{# applications en python3 #}
{% filter upper %}{{appkey}}{% endfilter %}_MANAGE_COMMAND = "{{venv_py3_bin}}/{{app['project_name']}}-manage"
{% else %}

View File

@ -1,6 +1,6 @@
[program:{{agent_dash_name}}]
; Concurrency set to 1 because there is no lock around calls to hobo_notify
command={{venv_bin}}/celery worker --hostname={{agent_dot_name}}.%%h --app=hobo.agent.worker --loglevel=INFO --concurrency=1
command={{venv_py3_bin}}/celery worker --hostname={{agent_dot_name}}.%%h --app=hobo.agent.worker --loglevel=INFO --concurrency=1
environment=HOBO_AGENT_SETTINGS_FILE="{{agent_settings}}",THEMES_DIRECTORY="{{themes_dir}}"
process_name={{agent_dash_name}}
user={{user}}

View File

@ -1,2 +1,2 @@
#!/bin/bash
HOBO_AGENT_SETTINGS_FILE="{{agent_settings}}" THEMES_DIRECTORY="{{themes_dir}}" {{venv_bin}}/celery worker --hostname={{agent_dot_name}}.%%h --app=hobo.agent.worker --loglevel=INFO --concurrency=1
HOBO_AGENT_SETTINGS_FILE="{{agent_settings}}" THEMES_DIRECTORY="{{themes_dir}}" {{venv_py3_bin}}/celery worker --hostname={{agent_dot_name}}.%%h --app=hobo.agent.worker --loglevel=INFO --concurrency=1

View File

@ -2,10 +2,10 @@ app_name: hobo
compile_scss: false
compile_translations: true
db_name: "{{apps['hobo']['db_name']}}"
manage_cmd: "{{venv_python}} {{src_dir}}/hobo/manage.py"
manage_cmd: "{{venv_py3_python}} {{src_dir}}/hobo/manage.py"
nginx_host_pattern: "{{apps['hobo']['nginx_host_pattern']}}"
nginx_template_name: "std-nginx-server.j2"
project_name: "{{apps['hobo']['project_name']}}"
server_port: "{{apps['hobo']['server_port']}}"
settings_env_var: HOBO_SETTINGS_FILE
virtualenv: "{{venv}}"
virtualenv: "{{venv_py3}}"