summaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
authorJan Pokorný <jpokorny@redhat.com>2014-05-26 13:47:53 +0200
committerJan Pokorný <jpokorny@redhat.com>2014-05-26 13:47:53 +0200
commita54b203eb4bb58d6e742805ce08048a37c87efbe (patch)
tree1ac4f443e436fd145c1304fdf7b18f47e5b1d824 /commands
parente89e2eb587e7e2d2eb82d788dab24ddc9571b195 (diff)
downloadclufter-a54b203eb4bb58d6e742805ce08048a37c87efbe.tar.gz
clufter-a54b203eb4bb58d6e742805ce08048a37c87efbe.tar.xz
clufter-a54b203eb4bb58d6e742805ce08048a37c87efbe.zip
commands/ccs2pcs_flatiron: drop generating (static) corosync.conf
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
Diffstat (limited to 'commands')
-rw-r--r--commands/ccs2pcs.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/commands/ccs2pcs.py b/commands/ccs2pcs.py
index ee9ba91..d7df015 100644
--- a/commands/ccs2pcs.py
+++ b/commands/ccs2pcs.py
@@ -12,14 +12,11 @@ from ..command import Command, CommandAlias
('ccs2ccs-pcmk'),
('ccs-revitalize',
('flatccs2pcs',
- ('pcs2simplepcs'))),
- ('ccs2flatironxml',
- ('xml2simpleconfig'))))
+ ('pcs2simplepcs')))))
def ccs2pcs_flatiron(cmd_ctxt,
input="/etc/cluster/cluster.conf",
ccs_pcmk="./cluster.conf",
cib="./cib.xml",
- coro="./corosync.conf",
nocheck=False,
raw=False):
"""CMAN -> Pacemaker-based cluster config. (corosync v1)
@@ -27,13 +24,12 @@ def ccs2pcs_flatiron(cmd_ctxt,
More specifically, the output is suitable for Pacemaker integrated
with Corosync ver. 1 (Flatiron) as present, e.g., in el6.{5, ..},
and consists of Pacemaker pass-through CMAN configuration (~cluster.conf)
- along with Pacemaker (~cib.xml) and corosync ones (~corosync.conf).
+ along with Pacemaker (~cib.xml) one.
Options:
input input CMAN-based cluster configuration file
ccs_pcmk output Pacemaker pass-through CMAN configuration
cib output Pacemaker-based cluster configuration file
- coro output Corosync v1 configuration file
nocheck do not validate any step (even if self-checks present)
raw do not ensure pretty-printed output where applicable
"""
@@ -47,9 +43,6 @@ def ccs2pcs_flatiron(cmd_ctxt,
(
('file', cib),
),
- ),
- (
- ('file', coro),
)
)
)