Skip to content

Commit e600926

Browse files
committed
Move prerequites task to a separate step
1 parent e39617f commit e600926

File tree

3 files changed

+34
-30
lines changed

3 files changed

+34
-30
lines changed

roles/os_images/tasks/images.yml

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,4 @@
11
---
2-
- name: Include OS family-specific variables
3-
ansible.builtin.include_vars: "{{ ansible_facts.os_family }}.yml"
4-
- name: Ensure required packages are installed
5-
ansible.builtin.package:
6-
name: "{{ (os_images_package_dependencies + os_images_package_dependencies_extra) | select | list }}"
7-
state: present
8-
become: true
9-
10-
# The rpm-distro element executes 'semanage' during its cleanup phase.
11-
- name: Ensure diskimage-builder SELinux dependencies are installed
12-
vars:
13-
package_name: python3-policycoreutils
14-
ansible.builtin.package:
15-
name: "{{ package_name }}"
16-
state: present
17-
when:
18-
- ansible_facts.selinux
19-
- ansible_facts.selinux.status != 'disabled'
20-
- ansible_facts.os_family == "RedHat"
21-
become: true
22-
23-
- name: Ensure download cache dir exists
24-
ansible.builtin.file:
25-
path: "{{ os_images_cache }}"
26-
owner: "{{ ansible_facts.user_uid }}"
27-
group: "{{ ansible_facts.user_gid }}"
28-
state: directory
29-
mode: "0755"
30-
become: true
31-
322
- name: Remove old images for force rebuild
333
ansible.builtin.file:
344
path: "{{ os_images_cache }}/{{ item.name }}"

roles/os_images/tasks/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
ansible.builtin.set_fact:
44
old_ansible_python_interpreter: "{{ ansible_python_interpreter | default('/usr/bin/python3') }}"
55

6+
- name: Prerequisite tasks
7+
ansible.builtin.import_tasks: prereqs.yml
8+
69
- name: Build or download images
710
ansible.builtin.import_tasks: images.yml
811
when: os_images_build | bool

roles/os_images/tasks/prereqs.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
- name: Include OS family-specific variables
3+
ansible.builtin.include_vars: "{{ ansible_facts.os_family }}.yml"
4+
5+
- name: Ensure required packages are installed
6+
ansible.builtin.package:
7+
name: "{{ (os_images_package_dependencies + os_images_package_dependencies_extra) | select | list }}"
8+
state: present
9+
become: true
10+
11+
# The rpm-distro element executes 'semanage' during its cleanup phase.
12+
- name: Ensure diskimage-builder SELinux dependencies are installed
13+
vars:
14+
package_name: python3-policycoreutils
15+
ansible.builtin.package:
16+
name: "{{ package_name }}"
17+
state: present
18+
when:
19+
- ansible_facts.selinux
20+
- ansible_facts.selinux.status != 'disabled'
21+
- ansible_facts.os_family == "RedHat"
22+
become: true
23+
24+
- name: Ensure download cache dir exists
25+
ansible.builtin.file:
26+
path: "{{ os_images_cache }}"
27+
owner: "{{ ansible_facts.user_uid }}"
28+
group: "{{ ansible_facts.user_gid }}"
29+
state: directory
30+
mode: "0755"
31+
become: true

0 commit comments

Comments
 (0)