diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-07 20:20:36 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-08 00:38:46 +0100 |
| commit | f25c19f7a3f90f2cf11f1352772756dadbe95bcc (patch) | |
| tree | ebd2402464408a1ba837ffd5999ac1eeb91d9824 /mcp | |
| parent | 7064c2c6fa373f8c1f20bfbc00aaf6f4b3b8994e (diff) | |
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>
(cherry picked from commit ea6ecbb6fb546e27fcc73e699e08c6cad31d2bd0)
Diffstat (limited to 'mcp')
3 files changed, 10 insertions, 2 deletions
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: diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml index 0350afa3d..719e47166 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml @@ -21,3 +21,7 @@ parameters: opnfv_vcp_vm_primary_interface: ${_param:opnfv_fn_vm_primary_interface} opnfv_vcp_vm_secondary_interface: ${_param:opnfv_fn_vm_secondary_interface} opnfv_vcp_vm_tertiary_interface: ${_param:opnfv_fn_vm_tertiary_interface} + + # MaaS timeouts + opnfv_maas_timeout_comissioning: 10 + opnfv_maas_timeout_deploying: 20 diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml index 1554a3291..1d6157605 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml @@ -21,3 +21,7 @@ parameters: opnfv_vcp_vm_primary_interface: ens2 opnfv_vcp_vm_secondary_interface: ens3 opnfv_vcp_vm_tertiary_interface: ens4 + + # MaaS timeouts + opnfv_maas_timeout_comissioning: 10 + opnfv_maas_timeout_deploying: 15 |