diff options
| author | Jan Pokorný <jpokorny@redhat.com> | 2014-10-24 16:15:18 +0200 |
|---|---|---|
| committer | Jan Pokorný <jpokorny@redhat.com> | 2014-11-14 22:08:31 +0100 |
| commit | 157e90d74da1d23f5ef7243b51989bd560bed1c5 (patch) | |
| tree | 8b8cd49891b7b3cb2c7f6f7593fab35d1610baef | |
| parent | b9fae8c040d78ae0d461c7dcecdfc25236c9028b (diff) | |
| download | clufter-157e90d74da1d23f5ef7243b51989bd560bed1c5.tar.gz clufter-157e90d74da1d23f5ef7243b51989bd560bed1c5.tar.xz clufter-157e90d74da1d23f5ef7243b51989bd560bed1c5.zip | |
filters/ccsflat2pcsprelude[cluster]: comment wrt. minimal config
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
| -rwxr-xr-x | __root__/run-check | 2 | ||||
| -rw-r--r-- | filters/cluster/__init__.py | 18 |
2 files changed, 17 insertions, 3 deletions
diff --git a/__root__/run-check b/__root__/run-check index 1c5e36d..f2b28b7 100755 --- a/__root__/run-check +++ b/__root__/run-check @@ -78,7 +78,7 @@ EOF { diff -u -- - "${testcib}" \ && echo "TEST: cib diff OK" \ || { echo "TEST: cib diff FAIL"; ret=21; }; }<<EOF -<cib validate-with="pacemaker-1.2" admin_epoch="1" epoch="1" num_updates="0" update-client="$(${PYTHONEXEC} run-dev --version | head -n1)"> +<cib validate-with="pacemaker-1.2" admin_epoch="0" epoch="0" num_updates="0" update-client="$(${PYTHONEXEC} run-dev --version | head -n1)"> <configuration> <crm_config/> <nodes> diff --git a/filters/cluster/__init__.py b/filters/cluster/__init__.py index c8465d5..366edb3 100644 --- a/filters/cluster/__init__.py +++ b/filters/cluster/__init__.py @@ -64,10 +64,24 @@ except ValueError: from ... import package_name, version ccsflat2pcsprelude_self_id = "{0} {1}".format(package_name(), version) +# should roughly match the output of: +# (exec 3>&1; exec >/dev/null; export CIB_shadow=test-shadow; +# crm_shadow -bfe "${CIB_shadow}"; cat "$(crm_shadow -bF)">&3; +# crm_shadow -bfD "${CIB_shadow}") +# <cib epoch="0" num_updates="0" admin_epoch="0" validate-with="pacemaker-1.2" +# cib-last-written="Wed Oct 22 15:14:04 2014"> +# <configuration> +# <crm_config/> +# <nodes/> +# <resources/> +# <constraints/> +# </configuration> +# <status/> +# </cib> ccsflat2pcsprelude = ('''\ <cib validate-with="pacemaker-1.2" - admin_epoch="1" - epoch="1" + admin_epoch="0" + epoch="0" num_updates="0" update-client="%(self_id)s"> |