Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes to adjust with latest ansible v2.16.3 #85

Merged
merged 2 commits into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion playbooks/ansible/roles/ctdb.setup/tasks/glusterfs/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@

- name: Process OS specific tasks
include_tasks: "{{ include_file }}"
vars:
prefix: "{{ role_path }}/tasks/glusterfs/"
with_first_found:
- files: "{{ config.os[config.nodes[inventory_hostname].os].includes }}"
- files: "{{ [prefix] | product(config.os[config.nodes[inventory_hostname].os].includes) | map('join') | list }}"
loop_control:
loop_var: include_file

Expand Down
4 changes: 3 additions & 1 deletion playbooks/ansible/roles/samba.setup/tasks/cephfs/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
block:
- name: Process OS specific tasks
include_tasks: "{{ include_file }}"
vars:
prefix: "{{ role_path }}/tasks/cephfs/"
with_first_found:
- files: "{{ config.os[config.nodes[inventory_hostname].os].includes }}"
- files: "{{ [prefix] | product(config.os[config.nodes[inventory_hostname].os].includes) | map('join') | list }}"

Check warning on line 10 in playbooks/ansible/roles/samba.setup/tasks/cephfs/main.yml

View workflow job for this annotation

GitHub Actions / yamllint

10:121 [line-length] line too long (121 > 120 characters)
loop_control:
loop_var: include_file

Expand Down
4 changes: 3 additions & 1 deletion playbooks/ansible/roles/samba.setup/tasks/glusterfs/main.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
---
- name: Process OS specific tasks
include_tasks: "{{ include_file }}"
vars:
prefix: "{{ role_path }}/tasks/glusterfs/"
with_first_found:
- files: "{{ config.os[config.nodes[inventory_hostname].os].includes }}"
- files: "{{ [prefix] | product(config.os[config.nodes[inventory_hostname].os].includes) | map('join') | list }}"
loop_control:
loop_var: include_file

Expand Down
4 changes: 3 additions & 1 deletion playbooks/ansible/roles/sit.cephfs/tasks/server/main.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
---
- name: Process OS specific tasks
include_tasks: "{{ include_file }}"
vars:
prefix: "{{ role_path }}/tasks/server/"
with_first_found:
- files: "{{ config.os[config.nodes[inventory_hostname].os].includes }}"
- files: "{{ [prefix] | product(config.os[config.nodes[inventory_hostname].os].includes) | map('join') | list }}"
loop_control:
loop_var: include_file

Expand Down
10 changes: 0 additions & 10 deletions playbooks/roles/setup.prep/tasks/centos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,6 @@
name: epel-release
state: latest

- name: Install Python3 pip
yum:
name: python3-pip
state: installed

- name: Install pip jinja2 library
pip:
name: jinja2
state: latest

# RHEL 8 image doesn't include make
- name: Install additional packages
yum:
Expand Down
13 changes: 13 additions & 0 deletions playbooks/roles/setup.prep/tasks/centos8.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
- name: Process common OS tasks
include_tasks: centos.yml

- name: Install Python3.12 pip
yum:
name: python3.12-pip
state: installed

- name: Install pip jinja2 library
pip:
executable: pip3.12
name: jinja2
12 changes: 12 additions & 0 deletions playbooks/roles/setup.prep/tasks/centos9.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
- name: Process common OS tasks
include_tasks: centos.yml

- name: Install Python3 pip
yum:
name: python3-pip
state: installed

- name: Install pip jinja2 library
pip:
name: jinja2
7 changes: 3 additions & 4 deletions playbooks/roles/sit.cephfs/tasks/setup/centos8.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
- name: Install Python jmespath module
yum:
name:
- python3.11-jmespath
state: latest
pip:
executable: pip3.12
name: jmespath
6 changes: 2 additions & 4 deletions playbooks/roles/sit.cephfs/tasks/setup/centos9.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
---
- name: Install Python jmespath module
yum:
name:
- python3-jmespath
state: latest
pip:
name: jmespath
4 changes: 3 additions & 1 deletion playbooks/roles/sit.cephfs/tasks/setup/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@

- name: Process OS specific tasks
include_tasks: "{{ include_file }}"
vars:
prefix: "{{ role_path }}/tasks/setup/"
with_first_found:
- files: "{{ config.os[config.nodes[inventory_hostname].os].includes }}"
- files: "{{ [prefix] | product(config.os[config.nodes[inventory_hostname].os].includes) | map('join') | list }}"
loop_control:
loop_var: include_file
7 changes: 3 additions & 4 deletions playbooks/roles/sit.glusterfs/tasks/setup/centos8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
include_tasks: centos.yml

- name: Install Python jmespath module
yum:
name:
- python3.11-jmespath
state: latest
pip:
executable: pip3.12
name: jmespath
6 changes: 2 additions & 4 deletions playbooks/roles/sit.glusterfs/tasks/setup/centos9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@
include_tasks: centos.yml

- name: Install Python jmespath module
yum:
name:
- python3-jmespath
state: latest
pip:
name: jmespath
4 changes: 3 additions & 1 deletion playbooks/roles/sit.glusterfs/tasks/setup/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@

- name: Process OS specific tasks
include_tasks: "{{ include_file }}"
vars:
prefix: "{{ role_path }}/tasks/setup/"
with_first_found:
- files: "{{ config.os[config.nodes[inventory_hostname].os].includes }}"
- files: "{{ [prefix] | product(config.os[config.nodes[inventory_hostname].os].includes) | map('join') | list }}"
loop_control:
loop_var: include_file
Loading