bkernel: drop nosync here too and fix logic to not change site-defaults in kojibuilder role

This caused a bit of trouble since I disabled nosync in the kojibuilder
role. I think applied that with -t site-defaults, which updated
everything, _including_ bkernel machines. Sadly, bkernel machines have
additional config in site-defaults to allow for secure boot signing and
this was lost. So, make sure only the bkernel role changes site-defaults
on bkernel machines and also drop nosync from it's private config.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2021-12-10 09:02:13 -08:00
parent 9495dd3b77
commit 3d121ae5ee
2 changed files with 3 additions and 2 deletions

View file

@ -2,8 +2,8 @@
config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/var/run/pesign', '/var/run/pesign' ))
config_opts['plugin_conf']['package_state_enable'] = False
config_opts['macros']['%bugurl'] = 'https://bugz.fedoraproject.org/%name'
config_opts['nosync'] = True
config_opts['nosync_force'] = True
#config_opts['nosync'] = True
#config_opts['nosync_force'] = True
config_opts['dnf_common_opts'] = ['--setopt=install_weak_deps=0']
config_opts['environment']['LANG'] = 'C.UTF-8'
config_opts['use_bootstrap'] = False

View file

@ -264,6 +264,7 @@
- name: mock site-defaults.cfg
template: src=builders/site-defaults.cfg dest=/etc/mock/site-defaults.cfg mode=0644 owner=root group=mock
when: not inventory_hostname.startswith(('bkernel'))
tags:
- koji_builder
- site-defaults