diff options
| author | Jan Pokorný <jpokorny@redhat.com> | 2014-02-18 19:10:18 +0100 |
|---|---|---|
| committer | Jan Pokorný <jpokorny@redhat.com> | 2014-02-18 19:13:59 +0100 |
| commit | 2650f08ed21380950ceecba52febd58c6cc6189e (patch) | |
| tree | 9355be13babaa0d59215ffe74f2521c2ff3e9fbc /commands | |
| parent | 55127cdfaedef7ce6d08715e2ed1e9406cdb8cc0 (diff) | |
| download | clufter-2650f08ed21380950ceecba52febd58c6cc6189e.tar.gz clufter-2650f08ed21380950ceecba52febd58c6cc6189e.tar.xz clufter-2650f08ed21380950ceecba52febd58c6cc6189e.zip | |
ccs2pcs now indeed produces corosync.conf (via XML2simpleconfig)
which required finalizing some missing functionality:
- XML's 'etree' -> simpleconfig's 'struct' (filters/XML2simpleconfig)
- simpleconfig's 'struct' produced/pretty-printed as 'bytestring'
(formats/simpleconfig)
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/ccs2pcs.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/commands/ccs2pcs.py b/commands/ccs2pcs.py index fde3796..5f0d5d7 100644 --- a/commands/ccs2pcs.py +++ b/commands/ccs2pcs.py @@ -9,10 +9,7 @@ from ..command import Command @Command.deco(('ccs2ccsflat', - 'ccsflat2pcs', 'ccs2coroxml')) -# XXX should be -#@Command.deco(('ccs2ccsflat', -# 'ccsflat2pcs', ('ccs2coroxml', 'coroxml2coroconf'))) + 'ccsflat2pcs', ('ccs2coroxml', 'xml2simpleconfig'))) def ccs2pcs(cmd_ctxt, input='/etc/cluster/cluster.conf', output='./cib.xml', @@ -31,4 +28,4 @@ def ccs2pcs(cmd_ctxt, """ #cmd_ctxt.filter()['validate'] = not nocheck #cmd_ctxt.filter('ccs2ccsflat')['validate'] = not nocheck - return ('file', input), (('file', output), ('file', coro)) + return ('file', input), (('file', output), (('file', coro), )) |