diff options
| author | Jan Pokorný <jpokorny@redhat.com> | 2015-06-19 01:11:46 +0200 |
|---|---|---|
| committer | Jan Pokorný <jpokorny@redhat.com> | 2015-06-19 17:35:09 +0200 |
| commit | 64205cc97eba8ec1a5d1b7c318660ffb25140531 (patch) | |
| tree | 6607b1854eb0e155576cf4071509166fcc7bdf8f | |
| parent | 6bc26f4666f425db265d3fffe9c69aafcda49133 (diff) | |
| download | clufter-64205cc97eba8ec1a5d1b7c318660ffb25140531.tar.gz clufter-64205cc97eba8ec1a5d1b7c318660ffb25140531.tar.xz clufter-64205cc97eba8ec1a5d1b7c318660ffb25140531.zip | |
commands/ccs2pcscmd: use unified filter defaults interface
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
| -rw-r--r-- | commands/ccs2pcscmd.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/commands/ccs2pcscmd.py b/commands/ccs2pcscmd.py index e21a80f..7efe683 100644 --- a/commands/ccs2pcscmd.py +++ b/commands/ccs2pcscmd.py @@ -28,10 +28,10 @@ def ccs2pcscmd_flatiron(cmd_ctxt, force=False, noauth=False, silent=False, - tmp_cib="tmp-cib.xml", # ~ filters.cib2pcscmd.TMP_CIB + tmp_cib="{cib2pcscmd.defs[pcscmd_tmpcib]}", dry_run=False, enable=False, - start_wait=90, + start_wait="{ccspcmk2pcscmd.defs[pcscmd_start_wait]}", noguidance=False, _common=XMLFilter.command_common): """(CMAN,rgmanager) cluster cfg. -> equivalent in pcs commands @@ -49,8 +49,6 @@ def ccs2pcscmd_flatiron(cmd_ctxt, noguidance omit extraneous guiding """ - if dry_run and not tmp_cib: - tmp_cib = "tmp-cib.xml" # ~ filters.cib2pcscmd.TMP_CIB cmd_ctxt['pcscmd_force'] = force cmd_ctxt['pcscmd_noauth'] = noauth cmd_ctxt['pcscmd_verbose'] = not(silent) |