diff options
| author | Jan Pokorný <jpokorny@redhat.com> | 2015-06-18 19:06:25 +0200 |
|---|---|---|
| committer | Jan Pokorný <jpokorny@redhat.com> | 2015-06-19 17:32:43 +0200 |
| commit | 03b1f361ded0bb939db3ec1cb77b9196e373920b (patch) | |
| tree | 552cc943e6598961915f20f27f771d237b6a8fd0 /commands | |
| parent | 7bd8dcc2257853d2c3e50e4ac4cb6592623b9746 (diff) | |
| download | clufter-03b1f361ded0bb939db3ec1cb77b9196e373920b.tar.gz clufter-03b1f361ded0bb939db3ec1cb77b9196e373920b.tar.xz clufter-03b1f361ded0bb939db3ec1cb77b9196e373920b.zip | |
commands/ccs2pcs{,cmd}: use disable-rg&version-bump filters
That was one of the reasons for factoring those filters out.
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/ccs2pcs.py | 10 | ||||
| -rw-r--r-- | commands/ccs2pcscmd.py | 14 |
2 files changed, 18 insertions, 6 deletions
diff --git a/commands/ccs2pcs.py b/commands/ccs2pcs.py index 10545a6..63018a8 100644 --- a/commands/ccs2pcs.py +++ b/commands/ccs2pcs.py @@ -34,7 +34,9 @@ ccsflat2cibfinal_chain = ('ccs-revitalize', ('cib2cibfinal'))))) @Command.deco(('ccs2ccsflat', - ('ccs2ccs-pcmk'), + ('ccs-disable-rg', + ('ccs2ccs-pcmk', + ('ccs-version-bump'))), (ccsflat2cibfinal_chain))) def ccs2pcs_flatiron(cmd_ctxt, input=PATH_CLUSTERCONF, @@ -59,7 +61,11 @@ def ccs2pcs_flatiron(cmd_ctxt, return ( file_proto(input), ( - file_proto(ccs_pcmk), + ( + ( + file_proto(ccs_pcmk), + ), + ), ( ( ( diff --git a/commands/ccs2pcscmd.py b/commands/ccs2pcscmd.py index 4f2c653..e21a80f 100644 --- a/commands/ccs2pcscmd.py +++ b/commands/ccs2pcscmd.py @@ -14,9 +14,11 @@ from .ccs2pcs import ccsflat2cibfinal_chain @Command.deco(('ccs2ccsflat', - ('ccs2ccs-pcmk', - ('ccspcmk2pcscmd', - ('stringiter-combine2'))), + ('ccs-disable-rg', + ('ccs2ccs-pcmk', + ('ccs-version-bump', + ('ccspcmk2pcscmd', + ('stringiter-combine2'))))), (ccsflat2cibfinal_chain, ('cib2pcscmd', ('stringiter-combine2'))))) @@ -63,7 +65,11 @@ def ccs2pcscmd_flatiron(cmd_ctxt, ( ( ( - file_proto(output), + ( + ( + file_proto(output), + ), + ), ), ), #( |