Skip to content

Commit a941098

Browse files
Use reset-bls-entries playbook in OFED workflow
1 parent a9a2b31 commit a941098

File tree

3 files changed

+28
-29
lines changed

3 files changed

+28
-29
lines changed

.github/workflows/package-build-ofed.yml

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,32 @@ jobs:
191191
run: |
192192
source venvs/kayobe/bin/activate &&
193193
source src/kayobe-config/kayobe-env --environment ci-builder &&
194-
kayobe seed host configure -e seed_bootstrap_user=cloud-user --skip-tags network,docker
194+
kayobe seed host configure --skip-tags network,docker
195+
env:
196+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
197+
198+
- name: Reset BLS entries on the seed host
199+
run: |
200+
source venvs/kayobe/bin/activate &&
201+
source src/kayobe-config/kayobe-env --environment ci-builder &&
202+
kayobe playbook run src/kayobe-config/etc/kayobe/ansible/reset-bls-entries.yml \
203+
-e "reset_bls_host=ofed-builder"
204+
env:
205+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
206+
207+
- name: Disable noexec in /var/tmp
208+
run: |
209+
source venvs/kayobe/bin/activate &&
210+
source src/kayobe-config/kayobe-env --environment ci-builder &&
211+
kayobe seed host command run --become --command "sed -i 's/noexec,//g' /etc/fstab"
212+
env:
213+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
214+
215+
- name: Reboot to apply the kernel update
216+
run: |
217+
source venvs/kayobe/bin/activate &&
218+
source src/kayobe-config/kayobe-env --environment ci-builder &&
219+
kayobe playbook run src/kayobe-config/etc/kayobe/ansible/reboot.yml
195220
env:
196221
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
197222

etc/kayobe/ansible/build-ofed.yml

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -30,33 +30,7 @@
3030
state: latest
3131
update_cache: true
3232

33-
- name: Set GRUB default index to saved
34-
ansible.builtin.lineinfile:
35-
path: /etc/default/grub
36-
line: "GRUB_DEFAULT=saved"
37-
38-
- name: Set update default index in kernel sysconfig
39-
ansible.builtin.lineinfile:
40-
path: /etc/sysconfig/kernel
41-
line: "UPDATEDEFAULT=yes"
42-
create: true
43-
44-
- name: Update the default kernel entry
45-
ansible.builtin.shell:
46-
cmd: |
47-
grubby --set-default /boot/$(rpm -qa kernel-devel | sed 's/kernel-devel/vmlinuz/g')
48-
grub2-mkconfig -o /boot/grub2/grub.cfg
49-
50-
- name: Disable noexec in temporary file system
51-
ansible.builtin.replace:
52-
path: /etc/fstab
53-
regexp: 'noexec,'
54-
55-
- name: Reboot builder to apply kernel update
56-
ansible.builtin.reboot:
57-
reboot_timeout: 600
58-
59-
- name: Add DOCA host repository
33+
- name: Add DOCA host repository package
6034
ansible.builtin.dnf:
6135
name: https://developer.nvidia.com/downloads/networking/secure/doca-sdk/DOCA_2.8/doca-host-2.8.0-204000_{{ stackhpc_pulp_doca_ofed_version }}_rhel9{{ stackhpc_pulp_repo_rocky_9_minor_version }}.x86_64.rpm
6236
disable_gpg_check: true

etc/kayobe/ansible/reset-bls-entries.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# https://opendev.org/openstack/diskimage-builder/src/branch/master/diskimage_builder/elements/rhel/post-install.d/03-reset-bls-entries
66

77
- name: Reset BLS entries
8-
hosts: overcloud
8+
hosts: "{{ reset_bls_host | default('overcloud') }}"
99
become: true
1010
tags:
1111
- reset-bls-entries

0 commit comments

Comments
 (0)