aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mcp/patches/0010-maas-region-allow-timeout-override.patch4
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml4
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml4
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