diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-23 04:23:26 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-23 22:06:28 +0200 |
| commit | 94dba8bdcf1cd1d14036954f88299e4279c68312 (patch) | |
| tree | 3be3ad5cf575a0c1cace266e96d9b868000a7828 /mcp/salt-formulas/maas | |
| parent | f3f8c094a817fa0f4a60ed25185b6ca226c630d1 (diff) | |
MaaS: commissioning/deployment retry
While at it, parametrize max attempt number in maas state's "wait_for",
and reduce retries count for certain simpler tasks.
Change-Id: I3ac2877719cdd32613bcf41186ebbb9f3f3aee93
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/salt-formulas/maas')
| -rw-r--r-- | mcp/salt-formulas/maas/machines/delete.sls | 12 | ||||
| -rw-r--r-- | mcp/salt-formulas/maas/machines/mark_broken_fixed.sls | 12 |
2 files changed, 24 insertions, 0 deletions
diff --git a/mcp/salt-formulas/maas/machines/delete.sls b/mcp/salt-formulas/maas/machines/delete.sls new file mode 100644 index 000000000..306dbca31 --- /dev/null +++ b/mcp/salt-formulas/maas/machines/delete.sls @@ -0,0 +1,12 @@ +{%- from "maas/map.jinja" import region with context %} + +maas_login_admin: + cmd.run: + - name: "maas-region apikey --username {{ region.admin.username }} > /var/lib/maas/.maas_credentials" + +# TODO: implement delete_machine via _modules/maas.py +delete_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 delete {{ pillar['system_id'] }}" + - require: + - cmd: maas_login_admin diff --git a/mcp/salt-formulas/maas/machines/mark_broken_fixed.sls b/mcp/salt-formulas/maas/machines/mark_broken_fixed.sls new file mode 100644 index 000000000..874718f6d --- /dev/null +++ b/mcp/salt-formulas/maas/machines/mark_broken_fixed.sls @@ -0,0 +1,12 @@ +{%- from "maas/map.jinja" import region with context %} + +maas_login_admin: + cmd.run: + - name: "maas-region apikey --username {{ region.admin.username }} > /var/lib/maas/.maas_credentials" + +# 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'] }}" + - require: + - cmd: maas_login_admin |