diff options
| author | Jan Pokorný <jpokorny@redhat.com> | 2015-12-01 16:41:52 +0100 |
|---|---|---|
| committer | Jan Pokorný <jpokorny@redhat.com> | 2015-12-17 23:35:44 +0100 |
| commit | 0b38587bcfa7c1d6b6cc46eb7f5fbac89579153f (patch) | |
| tree | 914177a4931eb6f826a55172a75ced1f1984f354 /__root__ | |
| parent | 8e039db541e76c94605063ea886852817377ab66 (diff) | |
| download | clufter-0b38587bcfa7c1d6b6cc46eb7f5fbac89579153f.tar.gz clufter-0b38587bcfa7c1d6b6cc46eb7f5fbac89579153f.tar.xz clufter-0b38587bcfa7c1d6b6cc46eb7f5fbac89579153f.zip | |
filters/cmd_wrap: revisit group/line wrap-filling algo
Previous one was just splitting into lines within a single group
(also, this was limited to at most one split! that in turn made
it a pretty broken text wrapping). Now it is two-ways allowing
also short-enough groups to be put on the same line, and as many
line splits is made as necessary for a proper text wrapping.
Also update the test counterparts (function run_check_cmd of
run-check script succeeds again after quite a long time!).
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
Diffstat (limited to '__root__')
| -rwxr-xr-x | __root__/run-check | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/__root__/run-check b/__root__/run-check index c752ebe..760f27d 100755 --- a/__root__/run-check +++ b/__root__/run-check @@ -223,19 +223,26 @@ pcs cluster setup --start --name one rhel6-node1 rhel6-node2 \\ sleep 60 pcs cluster cib tmp-cib.xml --config pcs -f tmp-cib.xml \\ - stonith create FENCEDEV-xvm fence_xvm pcmk_host_map rhel6-node1:rhel6-node1,rhel6-node2:rhel6-node2 + stonith create FENCEDEV-xvm fence_xvm \\ + pcmk_host_map=rhel6-node1:rhel6-node1,rhel6-node2:rhel6-node2 pcs -f tmp-cib.xml \\ - resource create RESOURCE-ip-192.168.0.128 ocf:heartbeat:IPaddr2 ip 192.168.0.128 + resource create RESOURCE-ip-192.168.0.128 ocf:heartbeat:IPaddr2 \\ + ip=192.168.0.128 pcs -f tmp-cib.xml \\ resource group add SERVICE-mm-GROUP RESOURCE-ip-192.168.0.128 pcs -f tmp-cib.xml \\ - constraint location SERVICE-mm-GROUP rule id constraint-id score INFINITY constraint-id=CONSTRAINT-LOCATION-SERVICE-mm-GROUP score=INFINITY #uname eq rhel6-node1 + constraint location SERVICE-mm-GROUP rule \\ + id=CONSTRAINT-LOCATION-SERVICE-mm-GROUP-rhel6-node1 \\ + constraint-id=CONSTRAINT-LOCATION-SERVICE-mm-GROUP score=INFINITY \\ + '#uname' eq rhel6-node1 pcs -f tmp-cib.xml \\ - constraint rule add CONSTRAINT-LOCATION-SERVICE-mm-GROUP id score INFINITY score=INFINITY #uname eq rhel6-node2 -pcs \\ - -f tmp-cib.xml constraint rule add CONSTRAINT-LOCATION-SERVICE-mm-GROUP id score \\ - -INFINITY score=-INFINITY \\ - #uname ne rhel6-node1 #uname ne rhel6-node2 + constraint rule add CONSTRAINT-LOCATION-SERVICE-mm-GROUP \\ + id=CONSTRAINT-LOCATION-SERVICE-mm-GROUP-rhel6-node2 score=INFINITY \\ + '#uname' eq rhel6-node2 +pcs -f tmp-cib.xml \\ + constraint rule add CONSTRAINT-LOCATION-SERVICE-mm-GROUP \\ + id=CONSTRAINT-LOCATION-SERVICE-mm-GROUP-RESTRICTED score=-INFINITY \\ + '#uname' ne rhel6-node1 '#uname' ne rhel6-node2 pcs cluster cib-push tmp-cib.xml --config EOF rm -f -- "${testcmd}" |