From ea6ecbb6fb546e27fcc73e699e08c6cad31d2bd0 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sun, 7 Jan 2018 20:20:36 +0100
Subject: MaaS: Set commission/deploy timeouts via reclass
Allow end-users to easily change the MaaS commissioning/deploying
timeouts by simply editing the reclass model.
While at it, use arch-specific values and bump deploy timeout on
AArch64 to 20 minutes instead of 15.
Change-Id: I37ae434ecebdd64effb007baa06c722b1db15c66
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
mcp/patches/0010-maas-region-allow-timeout-override.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'mcp/patches')
diff --git a/mcp/patches/0010-maas-region-allow-timeout-override.patch b/mcp/patches/0010-maas-region-allow-timeout-override.patch
index 37bdf5855..5b8d5a1fe 100644
--- a/mcp/patches/0010-maas-region-allow-timeout-override.patch
+++ b/mcp/patches/0010-maas-region-allow-timeout-override.patch
@@ -47,7 +47,7 @@ diff --git a/maas/region.sls b/maas/region.sls
+ file.replace:
+ - name: "/usr/lib/python3/dist-packages/maasserver/node_status.py"
+ - pattern: '^(\s+NODE_STATUS.COMMISSIONING:)\s+\d+,$'
-+ - repl: \1 {{ salt['pillar.get']('_param:opnfv_maas_timeout_comissioning', '10') }},
++ - repl: \1 {{ salt['pillar.get']('_param:opnfv_maas_timeout_comissioning', '20') }},
+ - require:
+ - pkg: maas_region_packages
+ - require_in:
@@ -57,7 +57,7 @@ diff --git a/maas/region.sls b/maas/region.sls
+ file.replace:
+ - name: "/usr/lib/python3/dist-packages/maasserver/node_status.py"
+ - pattern: '^(\s+NODE_STATUS.DEPLOYING:)\s+\d+,$'
-+ - repl: \1 {{ salt['pillar.get']('_param:opnfv_maas_timeout_deploying', '15') }},
++ - repl: \1 {{ salt['pillar.get']('_param:opnfv_maas_timeout_deploying', '40') }},
+ - require:
+ - pkg: maas_region_packages
+ - require_in:
--
cgit