diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-08-24 06:07:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-24 06:07:24 +0000 |
| commit | 0f3fc04189db6156dd3a6d85c834f94b1d0c69aa (patch) | |
| tree | bde7f37fafdcc27bbe0010f998dce8d14e7e5cb5 /mcp/salt-formulas/maas/machines | |
| parent | 599a570c55aab972aed0b98998e9b85c54a88408 (diff) | |
| parent | 94dba8bdcf1cd1d14036954f88299e4279c68312 (diff) | |
Merge "MaaS: commissioning/deployment retry"
Diffstat (limited to 'mcp/salt-formulas/maas/machines')
| -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 |