Projet

Général

Profil

0001-run-hobo-in-python3-40259.patch

Nicolas Roche, 03 mars 2020 09:27

Télécharger (6,13 ko)

Voir les différences: 

Subject: [PATCH] run hobo in python3 (#40259)


 delete-tenants.yml                                  | 2 +-
 install.yml                                         | 2 +-
 roles/hobo-agent/tasks/main.yml                     | 2 +-
 roles/hobo-agent/templates/hobo-agent-settings.j2   | 2 +-
 roles/hobo-agent/templates/hobo-agent-supervisor.j2 | 2 +-
 roles/hobo-agent/templates/hobo-agent.j2            | 2 +-
 roles/hobo/vars/main.yml                            | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)
delete-tenants.yml
4 4 
  vars:
5 5 
    venv_bin: "{{venv}}/bin"
6 6 
    venv_py3_bin: "{{venv_py3}}/bin"
7 7 
  roles:
8 8 
    - facts
9 9 

  		




  10
  10
  
    
  tasks:

  		




  11
  11
  
    
    - name: "delete hobo tenant"

  		




  12
  
  
    
      command: "{{venv_bin}}/{{apps['hobo']['project_name']}}-manage delete_tenant {{tenants_conf['dev-hobo']}}"

  		




  
  12
  
    
      command: "{{venv_py3_bin}}/{{apps['hobo']['project_name']}}-manage delete_tenant {{tenants_conf['dev-hobo']}}"

  		




  13
  13
  
    
      ignore_errors: yes

  		




  14
  14
  
    

  		




  15
  15
  
    
    - name: "delete combo user tenant"

  		




  16
  16
  
    
      command: "{{venv_py3_bin}}/{{apps['combo']['project_name']}}-manage delete_tenant {{tenants_conf['user-combo']}}"

  		




  17
  17
  
    
      ignore_errors: yes

  		




  18
  18
  
    

  		




  19
  19
  
    
    - name: "delete combo agent tenant"

  		




  20
  20
  
    
      command: "{{venv_py3_bin}}/{{apps['combo']['project_name']}}-manage delete_tenant {{tenants_conf['agent-combo']}}"

  		












  

    
      install.yml
    
  





  11
  11
  
    
    - passerelle

  		




  12
  12
  
    
    - fargo

  		




  13
  13
  
    
    - chrono

  		




  14
  14
  
    
    - bijoe

  		




  15
  15
  
    
    - welco

  		




  16
  16
  
    
    - hobo-agent

  		




  17
  17
  
    
    - end

  		




  18
  18
  
    
  vars:

  		




  19
  
  
    
    themes_dir: "{{venv}}/themes"

  		




  
  19
  
    
    themes_dir: "{{venv_py3}}/themes"

  		




  20
  20
  
    
    venv_bin: "{{venv}}/bin"

  		




  21
  21
  
    
    venv_py3_bin: "{{venv_py3}}/bin"

  		




  22
  22
  
    
    venv_certs: "{{venv}}/certs"

  		




  23
  23
  
    
    venv_python: "{{venv_bin}}/python"

  		




  24
  24
  
    
    venv_py3_python: "{{venv_py3_bin}}/python"

  		




  25
  25
  
    
    venv_share: "{{venv}}/share"

  		












  

    
      roles/hobo-agent/tasks/main.yml
    
  





  23
  23
  
    
- name: hobo agent settings file

  		




  24
  24
  
    
  template:

  		




  25
  25
  
    
    src: hobo-agent-settings.j2

  		




  26
  26
  
    
    dest: "{{agent_settings}}"

  		




  27
  27
  
    

  		




  28
  28
  
    
- name: agent script

  		




  29
  29
  
    
  template:

  		




  30
  30
  
    
    src: hobo-agent.j2

  		




  31
  
  
    
    dest: "{{venv_bin}}/{{agent_dash_name}}"

  		




  
  31
  
    
    dest: "{{venv_py3_bin}}/{{agent_dash_name}}"

  		




  32
  32
  
    
    mode: "u=rwx,g=rx,o=rx"

  		




  33
  33
  
    

  		




  34
  34
  
    
- name: hobo agent supervisor configuration

  		




  35
  35
  
    
  template:

  		




  36
  36
  
    
    src: hobo-agent-supervisor.j2

  		




  37
  37
  
    
    dest: "/etc/supervisor/conf.d/{{agent_dash_name}}.conf"

  		




  38
  38
  
    
  become: yes

  		












  

    
      roles/hobo-agent/templates/hobo-agent-settings.j2
    
  





  8
  8
  
    
{% endfor %}

  		




  9
  9
  
    
}

  		




  10
  10
  
    

  		




  11
  11
  
    
{% for appkey, app in apps.items() %}

  		




  12
  12
  
    
  {% if appkey == 'wcs' %}

  		




  13
  13
  
    
WCS_MANAGE_COMMAND = "{{venv_py3_bin}}/wcsctl.py -f {{publik_settings}}/wcs/wcs.cfg"

  		




  14
  14
  
    
WCS_MANAGE_TRY_COMMAND = "{{venv_py3_bin}}/wcsctl.py"

  		




  15
  15
  
    
  {% else %}

  		




  16
  
  
    
    {% if appkey in ('combo', 'chrono', 'fargo', 'passerelle') %}

  		




  
  16
  
    
    {% if appkey in ('combo', 'chrono', 'fargo', 'hobo', 'passerelle') %}

  		




  17
  17
  
    
    {# applications en python3 #}

  		




  18
  18
  
    
{% filter upper %}{{appkey}}{% endfilter %}_MANAGE_COMMAND = "{{venv_py3_bin}}/{{app['project_name']}}-manage"

  		




  19
  19
  
    
    {% else %}

  		




  20
  20
  
    
    {# cas général, applications Django toutjours en python2, devra disparaître #}

  		




  21
  21
  
    
{% filter upper %}{{appkey}}{% endfilter %}_MANAGE_COMMAND = "{{venv_bin}}/{{app['project_name']}}-manage"

  		




  22
  22
  
    
    {% endif %}

  		




  23
  23
  
    
{% filter upper %}{{appkey}}{% endfilter %}_MANAGE_TRY_COMMAND = {% filter upper %}{{appkey}}{% endfilter %}_MANAGE_COMMAND

  		




  24
  24
  
    
   {% endif %}

  		












  

    
      roles/hobo-agent/templates/hobo-agent-supervisor.j2
    
  





  1
  1
  
    
[program:{{agent_dash_name}}]

  		




  2
  2
  
    
; Concurrency set to 1 because there is no lock around calls to hobo_notify

  		




  3
  
  
    
command={{venv_bin}}/celery worker --hostname={{agent_dot_name}}.%%h --app=hobo.agent.worker --loglevel=INFO --concurrency=1

  		




  
  3
  
    
command={{venv_py3_bin}}/celery worker --hostname={{agent_dot_name}}.%%h --app=hobo.agent.worker --loglevel=INFO --concurrency=1

  		




  4
  4
  
    
environment=HOBO_AGENT_SETTINGS_FILE="{{agent_settings}}",THEMES_DIRECTORY="{{themes_dir}}"

  		




  5
  5
  
    
process_name={{agent_dash_name}}

  		




  6
  6
  
    
user={{user}}

  		




  7
  7
  
    
numprocs=1

  		




  8
  8
  
    
stdout_logfile=/var/log/{{agent_dash_name}}/stdout.log

  		




  9
  9
  
    
stderr_logfile=/var/log/{{agent_dash_name}}/stderr.log

  		




  10
  10
  
    

  		




  11
  11
  
    
autostart=true

  		












  

    
      roles/hobo-agent/templates/hobo-agent.j2
    
  





  1
  1
  
    
#!/bin/bash

  		




  2
  
  
    
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

  		




  
  2
  
    
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

  		












  

    
      roles/hobo/vars/main.yml
    
  





  1
  1
  
    
app_name: hobo

  		




  2
  2
  
    
compile_scss: false

  		




  3
  3
  
    
compile_translations: true

  		




  4
  4
  
    
db_name: "{{apps['hobo']['db_name']}}"

  		




  5
  
  
    
manage_cmd: "{{venv_python}} {{src_dir}}/hobo/manage.py"

  		




  
  5
  
    
manage_cmd: "{{venv_py3_python}} {{src_dir}}/hobo/manage.py"

  		




  6
  6
  
    
nginx_host_pattern: "{{apps['hobo']['nginx_host_pattern']}}"

  		




  7
  7
  
    
nginx_template_name: "std-nginx-server.j2"

  		




  8
  8
  
    
project_name: "{{apps['hobo']['project_name']}}"

  		




  9
  9
  
    
server_port: "{{apps['hobo']['server_port']}}"

  		




  10
  10
  
    
settings_env_var: HOBO_SETTINGS_FILE

  		




  11
  
  
    
virtualenv: "{{venv}}"

  		




  
  11
  
    
virtualenv: "{{venv_py3}}"

  		




  12
  
  
    
-