Skip to content

Commit

Permalink
bug-4767 Missing interface names for pxe boot
Browse files Browse the repository at this point in the history
- because update repos is enabled by default rpm-ostree install tries to upgrade selinux packages as dependency. There is a huge mess around, see also coreos/fedora-coreos-tracker#400
- workaround for installation of fix version of cri-o: disable vars, so we can overwrite them in inventory.
  • Loading branch information
Adrian Stadelmann committed Oct 13, 2020
1 parent 151ae0d commit f1fd6c2
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion inventory/live/group_vars/k8s-cluster/k8s-cluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ dns_domain: "{{ cluster_name }}"
container_manager: crio

crio_packages:
- "cri-o-1.18.2-1.module_f32+9134+d942e823.x86_64"
- "cri-o-1.18.3-1.module_f32+9460+d8fc2f96.x86_64"
- cri-tools

crio_pids_limit: 2048
Expand Down
9 changes: 5 additions & 4 deletions roles/bootstrap-os/tasks/bootstrap-fedora-coreos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,12 @@
become: true
when: need_bootstrap.rc != 0

# do not re-enable because trouble with crio installation
# see https://github.com/coreos/fedora-coreos-tracker/issues/592
- name: Enable fedora updates repo
raw: "sed -i 's|^enabled=0|enabled=1|g' /etc/yum.repos.d/fedora-updates.repo"
become: true
when: need_bootstrap.rc != 0
#- name: Enable fedora updates repo
# raw: "sed -i 's|^enabled=0|enabled=1|g' /etc/yum.repos.d/fedora-updates.repo"
# become: true
# when: need_bootstrap.rc != 0

- name: Enforce selinux
raw: "sed -i 's|^SELINUX=.*|SELINUX={{ preinstall_selinux_state }}|g' /etc/selinux/config"
Expand Down
8 changes: 5 additions & 3 deletions roles/container-engine/cri-o/vars/fedora.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
---
crio_packages:
- cri-o
- cri-tools

# TODO: task-15285: make version of crio configurable
# crio_packages:
# - cri-o
# - cri-tools

crio_conmon: /usr/libexec/crio/conmon

0 comments on commit f1fd6c2

Please sign in to comment.