summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2018-12-27 04:39:45 +0200
committerLars Wirzenius <liw@liw.fi>2018-12-27 04:39:45 +0200
commitea7b9bc1d3e5de362b5edf12603ee83c708ad1a1 (patch)
tree09bda77ff7d7120a16598b3e3764e81dee363cca
parentebc7a4e704ac3ca904e6cc1d49b86a457bcbaa01 (diff)
downloadvmdb2-ea7b9bc1d3e5de362b5edf12603ee83c708ad1a1.tar.gz
Change: allow old fields for apt, mkpart steps
-rw-r--r--vmdb/plugins/apt_plugin.py2
-rw-r--r--vmdb/plugins/partition_plugin.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/vmdb/plugins/apt_plugin.py b/vmdb/plugins/apt_plugin.py
index 97a7d87..22177dc 100644
--- a/vmdb/plugins/apt_plugin.py
+++ b/vmdb/plugins/apt_plugin.py
@@ -33,7 +33,7 @@ class AptPlugin(cliapp.Plugin):
class AptStepRunner(vmdb.StepRunnerInterface):
def get_required_keys(self):
- return ['apt', 'tag', 'packages']
+ return ['apt', 'packages']
def run(self, step, settings, state):
operation = step['apt']
diff --git a/vmdb/plugins/partition_plugin.py b/vmdb/plugins/partition_plugin.py
index 71ff58d..60d4225 100644
--- a/vmdb/plugins/partition_plugin.py
+++ b/vmdb/plugins/partition_plugin.py
@@ -47,14 +47,14 @@ class MklabelStepRunner(vmdb.StepRunnerInterface):
class MkpartStepRunner(vmdb.StepRunnerInterface):
def get_required_keys(self):
- return ['mkpart', 'device', 'start', 'end', 'tag']
+ return ['mkpart', 'device', 'start', 'end']
def run(self, step, settings, state):
part_type = step['mkpart']
device = step['device']
start = step['start']
end = step['end']
- tag = step.get('tag')
+ tag = step.get('tag') or step.get('part-tag')
if tag is None:
tag = step['part-tag']
fs_type = step.get('fs-type', 'ext2')