Projet

Général

Profil

0001-clean-last-python2-references-46530.patch

Emmanuel Cazenave, 07 octobre 2020 15:46

Télécharger (2,66 ko)

Voir les différences: 

Subject: [PATCH] clean last python2 references (#46530)


 delete-tenants.yml                                | 1 -
 group_vars/all                                    | 1 -
 install.yml                                       | 2 --
 roles/hobo-agent/templates/hobo-agent-settings.j2 | 6 ------
 4 files changed, 10 deletions(-)
delete-tenants.yml
2 2 
- name: delete all publik tenants
3 3 
  hosts: local
4 4 
  vars:
5 
    venv_bin: "{{venv}}/bin"
6 5 
    venv_py3_bin: "{{venv_py3}}/bin"
7 6 
  roles:
8 7 
    - facts
group_vars/all
9 9 
src_dir: "/home/{{user}}/src"
10 10 
ssl_certificate: "{{certs_dir}}/dev.publik.love-fullchain.pem"
11 11 
ssl_certificate_key: "{{certs_dir}}/dev.publik.love-privkey.pem"
12 
venv: "/home/{{user}}/envs/publik-env"
13 12 
venv_py3: "/home/{{user}}/envs/publik-env-py3"
14 13 
user: your_user_name
15 14 
postgresql_port: 5432
install.yml
18 18 
  vars:
19 19 
    certs_dir: "{{devinst_share}}/certs"
20 20 
    themes_dir: "{{devinst_share}}/themes"
21 
    venv_bin: "{{venv}}/bin"
22 21 
    venv_py3_bin: "{{venv_py3}}/bin"
23 
    venv_python: "{{venv_bin}}/python"
24 22 
    venv_py3_python: "{{venv_py3_bin}}/python"
roles/hobo-agent/templates/hobo-agent-settings.j2
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 ('authentic', 'bijoe', 'combo', 'chrono', 'fargo', 'hobo', 'passerelle', 'welco') %}
17 
    {# applications en python3 #}
18 16 
{% filter upper %}{{appkey}}{% endfilter %}_MANAGE_COMMAND = "{{venv_py3_bin}}/{{app['project_name']}}-manage"
19 
    {% else %}
20 
    {# cas général, applications Django toutjours en python2, devra disparaître #}
21 
{% filter upper %}{{appkey}}{% endfilter %}_MANAGE_COMMAND = "{{venv_bin}}/{{app['project_name']}}-manage"
22 
    {% endif %}
23 17 
{% filter upper %}{{appkey}}{% endfilter %}_MANAGE_TRY_COMMAND = {% filter upper %}{{appkey}}{% endfilter %}_MANAGE_COMMAND
24 18 
   {% endif %}
25 19 

  		




  26
  
  
    
-