summaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
authorJan Pokorný <jpokorny@redhat.com>2015-04-15 13:07:15 +0200
committerJan Pokorný <jpokorny@redhat.com>2015-04-15 15:26:20 +0200
commit20926d4f5f1b37f14ff49dbae540d585942a3918 (patch)
treec21c5834131f5f0529cd18501f2e28bf03af9693 /commands
parent9ed0f365be54eae2f817be16a8422a13c07ac2dd (diff)
downloadclufter-20926d4f5f1b37f14ff49dbae540d585942a3918.tar.gz
clufter-20926d4f5f1b37f14ff49dbae540d585942a3918.tar.xz
clufter-20926d4f5f1b37f14ff49dbae540d585942a3918.zip
commands/ccs2pcs: cosmetics/orderings (import/kwargs)
Unfortunately changing the order of ccs2pcs_needle kwargs also changed the order in which the arguments (when parsed in a terse/option-less notation) are expected --> fix that in run-check script as well. Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
Diffstat (limited to 'commands')
-rw-r--r--commands/ccs2pcs.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/commands/ccs2pcs.py b/commands/ccs2pcs.py
index 5f670cf..5c03924 100644
--- a/commands/ccs2pcs.py
+++ b/commands/ccs2pcs.py
@@ -6,9 +6,9 @@
__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
from ..command import Command, CommandAlias
+from ..facts import cluster_pcs_1_2, cluster_pcs_flatiron
from ..filter import XMLFilter
from ..protocol import protocols
-from ..facts import cluster_pcs_1_2, cluster_pcs_flatiron
def _check_pacemaker_1_2(cmd_ctxt):
@@ -79,8 +79,8 @@ def ccs2pcs_flatiron(cmd_ctxt,
(ccsflat2cibfinal_chain)))
def ccs2pcs_needle(cmd_ctxt,
input="/etc/cluster/cluster.conf",
- cib="cib-{ccs2ccsflat.in.hash}.xml",
coro="corosync-{ccs2ccsflat.in.hash}.conf",
+ cib="cib-{ccs2ccsflat.in.hash}.xml",
_common=XMLFilter.command_common):
"""(CMAN,rgmanager)->(Corosync v2,Pacemaker) cluster cfg.