Skip to content

Commit

Permalink
Merge branch 'story_10775_v5_fix_deployment_when_using_tags' into 'ma…
Browse files Browse the repository at this point in the history
…ster_5.x'

story #10775 - V5 fix deployment using tags

See merge request vitam/vitam!9370
  • Loading branch information
GiooDev committed Dec 2, 2022
2 parents 450a97f + aa40644 commit 4819f16
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
1 change: 1 addition & 0 deletions deployment/ansible-vitam/roles/vitam/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@
- "vitam - restart service"

- include_tasks: storage.yml
tags: always
when: vitam_struct.vitam_component == "storage" or vitam_struct.vitam_component == "ihm-recette"

- name: Deploy specific configuration files (can override the common configuration files)
Expand Down
10 changes: 10 additions & 0 deletions deployment/ansible-vitam/roles/vitam/tasks/storage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,22 @@
set_fact:
vitam_strategy_offers_names: "{{ vitam_strategy_offers_names + [item.name] }}"
loop: "{{ vitam_strategy }}"
tags:
- update_vitam_configuration

- name: Get the offers present in other_strategy but not in vitam_strategy
set_fact:
other_strategy_offers_list: "{{ (other_strategy_offers_list + [item]) | unique }}"
loop: "{{ other_strategies | default({}) | dict2items | sum(attribute='value', start=[]) }}"
when: item.name not in vitam_strategy_offers_names
tags:
- update_vitam_configuration

- name: Compute all offers (with offer configuration from vitam_offer by default)
set_fact:
all_used_offers: "{{ vitam_strategy + other_strategy_offers_list }}"
tags:
- update_vitam_configuration

- name: copy file for driver in data
template:
Expand All @@ -34,6 +40,8 @@
owner: "{{ vitam_defaults.users.vitam }}"
group: "{{ vitam_defaults.users.group }}"
mode: "{{ vitam_defaults.folder.folder_permission }}"
tags:
- update_vitam_configuration
notify:
- "vitam - restart service"
when: vitam_struct.vitam_component == "storage"
Expand All @@ -50,6 +58,8 @@
- report/system
- test-data/performance
- test-data/system
tags:
- update_vitam_configuration
notify:
- "vitam - restart service"
when: vitam_struct.vitam_component == "ihm-recette"

0 comments on commit 4819f16

Please sign in to comment.