Merge pull request #594 from akrzos/assisted_finalizing_timeouts

Add customizable finalizing timeouts for assisted-installer

Author: openshift-merge-bot[bot]

README.md

@@ -38,6 +38,7 @@ The listed hardware has been used for cluster deployments successfully. Potentia
 
 | Hardware           | MNO | SNO |
 | ------------------ | --- | --- |
+| Dell r750          | Yes | No  |
 | Dell r660          | Yes | Yes |
 | Dell r650          | Yes | Yes |
 | Dell r640          | Yes | Yes |

ansible/roles/bastion-assisted-installer/defaults/main/main.yml

@@ -16,3 +16,7 @@ assisted_postgres_image: quay.io/edge-infrastructure/postgresql-12-centos7
 assisted_installer_host: "{{ groups['bastion'][0] }}"
 assisted_installer_port: 8090
 assisted_image_service_port: 8888
+
+# Enables longer timeouts due to r750s longer reboot timing
+enable_assisted_installer_long_timeouts: false
+assisted_installer_long_timeout: 140m

ansible/roles/bastion-assisted-installer/templates/onprem-environment.j2

@@ -43,3 +43,23 @@ CONTROLLER_IMAGE={{ assisted_installer_controller_image.split(":")[0] }}@{{ assi
 CONTROLLER_IMAGE={{ assisted_installer_controller_image }}
 {% endif %}
 AGENT_DOCKER_IMAGE={{ assisted_installer_agent_image }}
+
+# Additional finalizing env variables to permit r750s with slow reboot time to join cluster
+{% if enable_assisted_installer_long_timeouts %}
+FINALIZING_STAGE_WAITING_FOR_CLUSTER_OPERATORS_TIMEOUT={{ assisted_installer_long_timeout }}
+FINALIZING_STAGE_ADDING_ROUTER_CA_TIMEOUT={{ assisted_installer_long_timeout }}
+FINALIZING_STAGE_APPLYING_OLM_MANIFESTS_TIMEOUT={{ assisted_installer_long_timeout }}
+FINALIZING_STAGE_WAITING_FOR_OLM_OPERATORS_CSV_INITIALIZATION_TIMEOUT={{ assisted_installer_long_timeout }}
+FINALIZING_STAGE_WAITING_FOR_OLM_OPERATORS_CSV_TIMEOUT={{ assisted_installer_long_timeout }}
+FINALIZING_STAGE_WAITING_FOR_OLM_OPERATOR_SETUP_JOBS_TIMEOUT={{ assisted_installer_long_timeout }}
+FINALIZING_STAGE_DONE_TIMEOUT={{ assisted_installer_long_timeout }}
+{% else %}
+# Set enable_assisted_installer_long_timeouts to true to enable during setup-bastion.yml
+# FINALIZING_STAGE_WAITING_FOR_CLUSTER_OPERATORS_TIMEOUT={{ assisted_installer_long_timeout }}
+# FINALIZING_STAGE_ADDING_ROUTER_CA_TIMEOUT={{ assisted_installer_long_timeout }}
+# FINALIZING_STAGE_APPLYING_OLM_MANIFESTS_TIMEOUT={{ assisted_installer_long_timeout }}
+# FINALIZING_STAGE_WAITING_FOR_OLM_OPERATORS_CSV_INITIALIZATION_TIMEOUT={{ assisted_installer_long_timeout }}
+# FINALIZING_STAGE_WAITING_FOR_OLM_OPERATORS_CSV_TIMEOUT={{ assisted_installer_long_timeout }}
+# FINALIZING_STAGE_WAITING_FOR_OLM_OPERATOR_SETUP_JOBS_TIMEOUT={{ assisted_installer_long_timeout }}
+# FINALIZING_STAGE_DONE_TIMEOUT={{ assisted_installer_long_timeout }}
+{% endif %}