Skip to content

Commit c1f9bbf

Browse files
committed
refactor: look for server wide only in shared
1 parent b931153 commit c1f9bbf

File tree

1 file changed

+5
-18
lines changed

1 file changed

+5
-18
lines changed

tasks/check-role-conf.yml

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,21 @@
44
odoo_role_odoo_server_wide_modules: "{{ odoo_role_odoo_server_wide_modules + ['dbfilter_from_header'] }}"
55
when: odoo_role_enable_dbfilter_from_header | bool
66
tags: ['server-wide']
7-
8-
- name: Generate server wide modules configuration (queue_job)
9-
set_fact:
10-
odoo_role_odoo_server_wide_modules: "{{ odoo_role_odoo_server_wide_modules + ['queue_job'] }}"
11-
when: odoo_role_enable_queue_job | bool
12-
tags: ['server-wide']
137

148
- name: Check requirements for db_filter (odoo_role_channels)
159
ansible.builtin.fail:
1610
msg: "Role Error: odoo_role_channels var is needed when queue_job is activated" # not required. The customized message that is printed. If omitted, prints a generic message.
1711
when: odoo_role_enable_dbfilter_from_header | bool and odoo_role_channels is not defined
1812
tags: ['server-wide']
1913

20-
- name: Extract databases from modules_dict
14+
- name: Generate server wide modules configuration (queue_job)
2115
ansible.builtin.set_fact:
22-
odoo_role_database_plugins: "{{ odoo_role_database_plugins | default([]) + [ item ] }}"
23-
with_items: "{{ odoo_role_odoo_community_modules_dict }}"
16+
odoo_role_odoo_server_wide_modules: "{{ odoo_role_odoo_server_wide_modules + ['queue_job'] }}"
17+
when: odoo_role_enable_queue_job | bool
2418
tags: ['server-wide']
2519

2620
- name: Check if server_wide modules are declared
27-
ansible.builtin.set_fact:
28-
odoo_role_all_plugins: "{{ odoo_role_all_plugins | default([]) + [ odoo_role_odoo_community_modules_dict[item] ] | flatten }}"
29-
with_items: "{{ odoo_role_database_plugins }}"
30-
tags: ['server-wide']
31-
32-
- name: Require server_wide_modules to be declared
3321
ansible.builtin.fail:
34-
msg: "Role Error: odoo_role_odoo_server_wide_modules are declared but not present on odoo_role_odoo_community_modules_dict"
22+
msg: "Role Error: {{ item }} module is configured as a server wide module but it is not present in modules dict"
3523
with_items: "{{ odoo_role_odoo_server_wide_modules }}"
36-
when: (item not in odoo_role_all_plugins) and (item != 'base' and item != 'web')
37-
tags: ['server-wide']
24+
when: (item not in odoo_role_odoo_community_modules_dict['shared']) and (item != 'web') and (item != 'base')

0 commit comments

Comments
 (0)