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 21:55:14 +0000 |
| commit | 72d9201cb025e3c76df62892d03830863c2d751e (patch) | |
| tree | 4784d86e2a8373e2621d6ce04837ab2180b48a27 /mcp/salt-formulas/maas/machines | |
| parent | 1e7d57ed87857c65613f83532d46b5d3721174ef (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>
(cherry picked from commit 01e94712d75c0a1cf7585f0ed380dd9a3967274e)
Diffstat (limited to 'mcp/salt-formulas/maas/machines')
| -rw-r--r-- | mcp/salt-formulas/maas/machines/mark_broken_fixed.sls | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mcp/salt-formulas/maas/machines/mark_broken_fixed.sls b/mcp/salt-formulas/maas/machines/mark_broken_fixed.sls index 874718f6d..4829fb1d0 100644 --- a/mcp/salt-formulas/maas/machines/mark_broken_fixed.sls +++ b/mcp/salt-formulas/maas/machines/mark_broken_fixed.sls @@ -7,6 +7,6 @@ maas_login_admin: # TODO: implement mark_broken_fixed_machine via _modules/maas.py mark_broken_fixed_machine: cmd.run: - - name: "maas login {{ region.admin.username }} http://{{ region.bind.host }}:5240/MAAS/api/2.0 - < /var/lib/maas/.maas_credentials && maas opnfv machine mark-broken {{ pillar['system_id'] }} && maas opnfv machine mark-fixed {{ pillar['system_id'] }}" + - name: "maas login {{ region.admin.username }} http://{{ region.bind.host }}:5240/MAAS/api/2.0 - < /var/lib/maas/.maas_credentials && maas opnfv machine mark-broken {{ pillar['system_id'] }} && sleep 30 && maas opnfv machine mark-fixed {{ pillar['system_id'] }}" - require: - cmd: maas_login_admin |