From 96019123adad087bc0d744a6785ceebb7b21476d Mon Sep 17 00:00:00 2001 From: ting wu Date: Thu, 3 May 2018 12:28:06 +0200 Subject: [maas] Adopt maas.machines.storage Replace MAAS CLI set_disk_layout with the new maas.machines.storage state JIRA: FUEL-364 Change-Id: I4d8cd9f473c5386ee7b32ad378ca1e02989233ca Signed-off-by: ting wu --- .../maas/machines/set_storage_layout.sls | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 mcp/salt-formulas/maas/machines/set_storage_layout.sls (limited to 'mcp/salt-formulas/maas') 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 -- cgit 1.2.3-korg