summaryrefslogtreecommitdiffstats
path: root/mcp/salt-formulas
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-05-25 17:10:43 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-05-25 17:10:43 +0000
commit996a8a8518d5e3baf72b7882112f4a15c184b5eb (patch)
tree22b40a6cdba30bb0cbce0e0860e59249a30ed631 /mcp/salt-formulas
parentf63c58f98b6ddbf64f300ed0495be3dd88e242e0 (diff)
parent79ff9f34a9e6ccdc1ca33fe58ff6b0bb565b22ac (diff)
Merge "[maas] Adopt maas.machines.storage" into stable/fraser
Diffstat (limited to 'mcp/salt-formulas')
-rw-r--r--mcp/salt-formulas/maas/machines/set_storage_layout.sls20
1 files changed, 0 insertions, 20 deletions
diff --git a/mcp/salt-formulas/maas/machines/set_storage_layout.sls b/mcp/salt-formulas/maas/machines/set_storage_layout.sls
deleted file mode 100644
index 0b7e37153..000000000
--- a/mcp/salt-formulas/maas/machines/set_storage_layout.sls
+++ /dev/null
@@ -1,20 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-{%- 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"
- - unless: 'test -e /var/lib/maas/.maas_credentials'
-
-# TODO: implement set_storage_layout via _modules/maas.py
-set_storage_layout:
- 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 set-storage-layout {{ pillar['system_id'] }} storage_layout={{ pillar['storage_layout'] | default('lvm') }} lv_size={{ pillar['lv_size'] | default('100%') }}"
- - require:
- - cmd: maas_login_admin