Skip to content
Draft
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
5 changes: 3 additions & 2 deletions roles/config_drive/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,14 @@
- artifacts
- logs

# xorriso provides genisoimage since RHEL 9
- name: Install required RPM packages
tags:
- packages
become: true
ansible.builtin.package:
name:
- genisoimage
- xorriso
- gzip
- coreutils
state: present
Expand Down Expand Up @@ -97,7 +98,7 @@
output_dir: "{{ cifmw_config_drive_basedir }}/artifacts"
creates: "{{ cifmw_config_drive_iso_image }}"
script: >-
genisoimage -output {{ cifmw_config_drive_iso_image }} -volid CIDATA
xorrisofs -output {{ cifmw_config_drive_iso_image }} -volid CIDATA
-joliet
-rock user-data meta-data
{% if cifmw_config_drive_networkconfig is defined and
Expand Down
1 change: 0 additions & 1 deletion roles/devscripts/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

cifmw_devscripts_packages:
- ipmitool
- NetworkManager-initscripts-updown
- patch
- python3-jmespath
- buildah
Expand Down
2 changes: 1 addition & 1 deletion roles/dnsmasq/tasks/configure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
setype: "dnsmasq_etc_t"
- target: "{{ cifmw_dnsmasq_basedir }}(/.*)?"
setype: "dnsmasq_etc_t"
- target: "/var/run/cifmw-dnsmasq.pid"
- target: "/run/cifmw-dnsmasq.pid"
setype: "dnsmasq_var_run_t"

- name: Manage configuration directory
Expand Down
2 changes: 1 addition & 1 deletion roles/dnsmasq/templates/cifmw-dnsmasq.conf.j2
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Managed by ci-framework/dnsmasq
user=dnsmasq
group=dnsmasq
pid-file=/var/run/cifmw-dnsmasq.pid
pid-file=/run/cifmw-dnsmasq.pid
dhcp-leasefile=/var/lib/dnsmasq/cifmw-dnsmasq.leases

{% if cifmw_dnsmasq_raw_config | length > 0 -%}
Expand Down
Loading