Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,3 @@ monitor_path = ""\n\
monitor_cgroup = "system.slice"\n\
monitor_exec_cgroup = ""\n\
privileged_without_host_devices = false\n' > "/etc/crio/crio.conf.d/microshift-crun.conf"

# Extend Greenboot wait timeout to 10m for MicroShift to be ready
RUN printf '\nMICROSHIFT_WAIT_TIMEOUT_SEC=600\n' >> /etc/greenboot/greenboot.conf
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,3 @@ RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \
firewall-offline-cmd --zone=public --add-port=6443/tcp && \
firewall-offline-cmd --zone=public --add-port=30000-32767/tcp && \
firewall-offline-cmd --zone=public --add-port=30000-32767/udp

# Extend Greenboot wait timeout to 10m for MicroShift to be ready
RUN printf '\nMICROSHIFT_WAIT_TIMEOUT_SEC=600\n' >> /etc/greenboot/greenboot.conf
3 changes: 3 additions & 0 deletions test/kickstart-templates/includes/post-system.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,6 @@ ln -sf /dev/null /etc/systemd/user/grub-boot-success.timer
echo "fs.inotify.max_user_watches = 65536" >> /etc/sysctl.conf
echo "fs.inotify.max_user_instances = 8192" >> /etc/sysctl.conf
sysctl --system

# Extend Greenboot wait timeout to 10m for MicroShift to be ready
echo "MICROSHIFT_WAIT_TIMEOUT_SEC=600" >> /etc/greenboot/greenboot.conf