From 0fbcb3ac171020730395ec7893ed789a9ac1464c Mon Sep 17 00:00:00 2001 From: Kaspars Skels Date: Sat, 13 Oct 2018 11:38:12 -0500 Subject: [PATCH] Adjust timeouts for deployment/MAAS - MAAS can be slow on downloading images required. - Deployment of full-site takes 1h+ Change-Id: Id64d741a61ed3995ead61f1d3b219d5d3c021e6e --- global/software/charts/ucp/drydock/maas.yaml | 6 +++++- .../deployment/deployment-configuration.yaml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/global/software/charts/ucp/drydock/maas.yaml b/global/software/charts/ucp/drydock/maas.yaml index 62a59b272..7affdc8d8 100644 --- a/global/software/charts/ucp/drydock/maas.yaml +++ b/global/software/charts/ucp/drydock/maas.yaml @@ -155,7 +155,7 @@ data: release: maas namespace: ucp wait: - timeout: 600 + timeout: 1800 labels: release_group: airship-maas install: @@ -179,6 +179,10 @@ data: proxy: node_port: enabled: true + jobs: + import_boot_resources: + timeout: 1800 + conf: cache: enabled: true diff --git a/site/airship-seaworthy/deployment/deployment-configuration.yaml b/site/airship-seaworthy/deployment/deployment-configuration.yaml index 752ce434c..3f82996c3 100644 --- a/site/airship-seaworthy/deployment/deployment-configuration.yaml +++ b/site/airship-seaworthy/deployment/deployment-configuration.yaml @@ -19,7 +19,7 @@ data: deploy_timeout: 3600 destroy_interval: 30 destroy_timeout: 900 - join_wait: 120 + join_wait: 0 prepare_node_interval: 30 prepare_node_timeout: 1800 prepare_site_interval: 10