From 94dba8bdcf1cd1d14036954f88299e4279c68312 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 23 Aug 2017 04:23:26 +0200 Subject: 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 --- mcp/salt-formulas/maas/machines/delete.sls | 12 ++++++++++++ mcp/salt-formulas/maas/machines/mark_broken_fixed.sls | 12 ++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 mcp/salt-formulas/maas/machines/delete.sls create mode 100644 mcp/salt-formulas/maas/machines/mark_broken_fixed.sls (limited to 'mcp/salt-formulas') 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 -- cgit 1.2.3-korg