diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-23 21:35:03 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-23 23:01:28 +0200 |
| commit | 01e94712d75c0a1cf7585f0ed380dd9a3967274e (patch) | |
| tree | 4784d86e2a8373e2621d6ce04837ab2180b48a27 /mcp/salt-formulas/maas/pxe_route.sls | |
| parent | ee4d89f2803085bdd4a7f3b365e40ec9366c25a9 (diff) | |
MaaS: Reduce C/D timeouts, minor fixes
- add new patch for maas.region, extending it poorly with a timeout
override mechanism; the new comissioning/deploying timeout defaults
(10/15min) will be used instead of MaaS defaults (20/40min), unless
reclass params are defined with different values;
- add 30s delay between 'machine mark-broken' and 'machine mark-fixed'
MaaS cli commands (fixes a rare race condition);
- fix forgotten replace in 'maas.pxe_route': s/opnfv_fuel_/opnfv_/g;
Change-Id: I71c562b80031bac2793dd470d52928c2d62e5300
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/salt-formulas/maas/pxe_route.sls')
| -rw-r--r-- | mcp/salt-formulas/maas/pxe_route.sls | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mcp/salt-formulas/maas/pxe_route.sls b/mcp/salt-formulas/maas/pxe_route.sls index 5f7cebdda..9c22b2a76 100644 --- a/mcp/salt-formulas/maas/pxe_route.sls +++ b/mcp/salt-formulas/maas/pxe_route.sls @@ -3,6 +3,6 @@ routes: - name: {{ salt['pillar.get']('_param:opnfv_fn_vm_primary_interface') }} - routes: - name: maas_mcp_to_pxe_network - ipaddr: {{ salt['pillar.get']('_param:opnfv_fuel_maas_pxe_network') }} + ipaddr: {{ salt['pillar.get']('_param:opnfv_maas_pxe_network') }} netmask: 255.255.255.0 - gateway: {{ salt['pillar.get']('_param:opnfv_fuel_maas_mcp_address') }} + gateway: {{ salt['pillar.get']('_param:opnfv_maas_mcp_address') }} |