summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* general: use python2 (sys.executable), not python (PEP 394)Jan Pokorný2015-04-088-18/+20
| | | | | | | | Hopefully there is no major roadblock making this change unreasonable at this point in time (checked commonly used RHEL, Fedora, Debian/Ubuntu -- the latter also for seamless integration with Travis CI). Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* travis: fix unterminated single-quoteJan Pokorný2015-04-081-1/+1
| | | | Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* ccs-flatten: (fwd-)port "resource-defaults section" supportJan Pokorný2015-04-083-0/+94
| | | | | | | | See, e.g., https://git.fedorahosted.org/cgit/cluster.git/commit/?h=STABLE32&id=5bddd1e21098a183560f64a569dd15fa8fdca1a8 https://bugzilla.redhat.com/show_bug.cgi?id=707118#c9 Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* ccs-flatten/restree: propagate also default param valuesJan Pokorný2015-04-081-0/+2
| | | | | | | ... as this is the most suitable moment (we will not be parsing resource rules/metadata later again). Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* ccs-flatten/restree: use shorter, memoized expressionJan Pokorný2015-04-081-10/+10
| | | | Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* filters/ccsflat2cibprelude[tomcat-6]: more descriptive msgJan Pokorný2015-04-081-1/+2
| | | | Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* filters/ccsflat2cibprelude[samba]: make drop of params explicitJan Pokorný2015-04-081-0/+8
| | | | | | Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1201290 Reported-by: Patrik Hagara <phagara@redhat.com> Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* filters/ccsflat2cibprelude[samba]: +convert shutdown_waitJan Pokorný2015-04-081-1/+8
| | | | Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* filters/ccsflat2cibprelude[samba]: nonfatal distro missJan Pokorný2015-04-081-6/+12
| | | | | | | When we are not sure about how to run samba on the target system, simply assume service:samba. Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* filters/ccs-artefacts[named]: also track artefactsJan Pokorný2015-04-081-0/+9
| | | | Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* filters/ccsflat2cibprelude[named]: enable conversionJan Pokorný2015-04-081-0/+34
| | | | | | Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1201278 Reported-by: Patrik Hagara <phagara@redhat.com> Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* run-check: acknowledge distro differences even for ccs2cibJan Pokorný2015-04-081-2/+3
| | | | | | | | | | Hence hard-code the distro to the testing command to make sure it reproduces what the hardwired referential results where obtained with. Check, e.g., this commit to learn about what I mean: filters/ccsflat2cibprelude[clusternode]: conditional node id. Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* filters/ccsflat2cibprelude[bind-mount]: fix _fs branchingJan Pokorný2015-04-081-9/+11
| | | | | | | | | | | Originally, the intended decision point couldn't be reached due to logical exclusion by the parent condition. Beside fixing that, also rearrange the order of sibling choices so as to better reflect the intended logic. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1206585 Reported-by: Patrik Hagara <phagara@redhat.com> Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* filters/ccsflat2cibprelude[samba]: fix pseudo-conversionJan Pokorný2015-04-081-26/+25
| | | | | | | | | | | | | | ...by removing extraneous xsl:attribute closing tag, adding missing closing brace in test expression of xsl:when, and reindenting the whole XLS snippet. (FWIW, previously wasn't the branching based on system/distro working correctly, until recent commit: filter: inject virtual "just merge, preserve-rest" abs. parent) Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1208128 Reported-by: Patrik Hagara <phagara@redhat.com> Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* filters/ccsflat2cibprelude[tomcat-6]: fix pseudo-conversionJan Pokorný2015-04-081-0/+1
| | | | | | | | | | | | ...by adding missed xsl:choose closing tag. (FWIW, previously wasn't the branching based on system/distro working correctly, until recent commit: filter: inject virtual "just merge, preserve-rest" abs. parent) Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1208133 Reported-by: Patrik Hagara <phagara@redhat.com> Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* filters/ccsflat2cibprelude[clusternode]: conditional node idJan Pokorný2015-04-081-4/+23
| | | | | Resolves: rhbz#1207345 Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* filter: inject virtual "just merge, preserve-rest" abs. parentJan Pokorný2015-04-081-2/+10
| | | | | | | | | | | | | This is needed so as to spread top level XSLT tags from implicit def_first ($system{,_1,_2} params, etc.). (Alternatively, we could somehow propagate the parameters Python-wise and then passed them to respective method: http://lxml.de/xpathxslt.html#stylesheet-parameters but this seems bit more systemic [although clunky]) Related: rhbz#1207345 Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* main: extra --dist handling callbackJan Pokorný2015-04-081-1/+31
| | | | | | | | | Q: performing the check upon option parsing means this check is not performed for both the default value and when clufter used as a lib A: mocking some arguments to the callback will make it universal (alternatively, refactorization, etc.) Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* main: enable the option-handling callbacks to be verboseJan Pokorný2015-04-081-0/+2
| | | | | | (preparation work) Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* main: normalize "sys" option value to lowercaseJan Pokorný2015-04-081-5/+11
| | | | | | | (headbang: this is what the conversion templates already rely upon, i.e., on "linux", not "Linux", which is what platform.system returns) Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* facts: overload/extend aliases_dist mappingJan Pokorný2015-04-081-2/+9
| | | | Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* commands/ccs2pcs: refactor out "ccsflat2cibfinal_chain"Jan Pokorný2015-04-081-10/+7
| | | | Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* refactor: pcs (not in command names) -> cibJan Pokorný2015-04-0834-95/+95
| | | | | | "pcs" should be reserved for actual pcs CLI tool commands. Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* Set pre-release versionJan Pokorný2015-04-082-2/+5
| | | | Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* Bump version to 0.10.3v0.10.3Jan Pokorný2015-03-202-3/+3
| | | | Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* filters/ccsflat2pcsprelude[postgres-8]: fix a ".." hackJan Pokorný2015-03-201-2/+2
| | | | | | | | | We hadn't been going up enough (from '/etc/init.d/'). Still thinking about a better solution, though. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1201297 Reported-by: Patrik Hagara <phagara@redhat.com> Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* run-sdist-per-commit: quote command substitutionJan Pokorný2015-03-201-2/+2
| | | | | | | | ... to prevent word splitting (marked suspicious by ShellCheck tool) Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* run-tests: remove unnecessary command substitutionJan Pokorný2015-03-201-2/+2
| | | | | | (marked suspicious by ShellCheck tool) Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* run-sdist: fix popd being called too earlyJan Pokorný2015-03-201-1/+1
| | | | Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* ccs-flatten/list.h: spare extra checks (per rgmanager upstream)Jan Pokorný2015-03-201-2/+2
| | | | Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* ccs-flatten/list.h: list_do{,ne}: spare extra checkJan Pokorný2015-03-201-1/+4
| | | | | | | ... that also makes this wrapped iteration more-or-less compatible with list_remove (see the in-line comment, but discretion needed, untested!) Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* ccs-flatten/list.h: fix logical subtleties w/ list_do{,ne}Jan Pokorný2015-03-201-3/+3
| | | | | | | | | | | | list_do: do not check *list twice list_done: do not check curr, as we are quite sure it will never reach NULL value implicitly (using intended list manipulators incl. the wrapped iteration itself, not explicit redefinition that is broken anyway), otherwise we would have already observed either trivial infloops or segfaults caused by reliance on such an assumption (curr != NULL) Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* ccs-flatten/Makefile: standard builds w/ defined NDEBUGJan Pokorný2015-03-202-3/+4
| | | | | | Also drop unnecessary assert.h include from xmlconf.c Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* Set pre-release versionJan Pokorný2015-03-202-3/+6
| | | | Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* Bump version to 0.10.2v0.10.2Jan Pokorný2015-03-162-3/+3
| | | | Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* setup: s/copymode/copystat/ not to diverge in multilib *.py[co]Jan Pokorný2015-03-161-3/+3
| | | | Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* ccs-flatten/res{list.h,rules.c}: drop unused functionJan Pokorný2015-03-162-24/+2
| | | | | | (code marked suspicious by static analysis) Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* ccs-flatten/reslist.c: avoid NULL pointer derefJan Pokorný2015-03-161-4/+4
| | | | | | (found by static analysis) Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* ccs-flatten/flatten.c: avoid fclose(NULL)Jan Pokorný2015-03-161-2/+2
| | | | | | (finding of static analysis) Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* filters/ccsflat2pcsprelude[tomcat-6]: enable pseudo-conversionJan Pokorný2015-03-161-1/+68
| | | | | | | | | | | | | Problem is in "params in system-wide sysconfig file" (rgmanager RA) vs. "params properly tracked as cluster config" (heartbeat RA). Could be extended to actually read the referred file, but that is quite unreliable (existence of that file cannot be assumed in various scenarios). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1201317 Reported-by: Patrik Hagara <phagara@redhat.com> Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* utils_cib + filters/ccsflat2pcsprelude: rg2hb_xsl: s/required/reqJan Pokorný2015-03-163-10/+10
| | | | Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* filters/ccsflat2pcsprelude[mysql]: + @{startup,shutdown}_waitJan Pokorný2015-03-161-0/+9
| | | | | | Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1201282 Reported-by: Patrik Hagara <phagara@redhat.com> Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* utils_cib + filters/ccsflat2pcsprelude: rg2hb_xsl "macro"Jan Pokorný2015-03-166-74/+72
| | | | | | | | Promised "more systemic/less error-prone solution" to prevent random mistakes/typos/inconsistencies and to exercise DRY principle (slash common sense). Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* filters/ccsflat2pcsprelude[postgres-8]: fix duplicate nvpair IDsJan Pokorný2015-03-161-2/+2
| | | | | | | (Clearly a sign more systemic/less error-prone solution needed, in the works...) Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* filters/ccsflat2pcsprelude[postgres-8]: consider also @startup_waitJan Pokorný2015-03-161-0/+10
| | | | | | Using "operations" provision (akin to apache/@shutdown_wait). Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* filters/ccsflat2pcsprelude[nfsserver]: fix duplicated @pgdbaJan Pokorný2015-03-161-7/+1
| | | | | Reported-by: Patrik Hagara <phagara@redhat.com> Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* filters/ccsflat2pcsprelude[nfsserver]: consider also @statdportJan Pokorný2015-03-161-0/+7
| | | | | | | | | | | Parameter added to rgmanager's RA as of https://bugzilla.redhat.com/show_bug.cgi?id=918315 and heartbeat's RA as of https://bugzilla.redhat.com/show_bug.cgi?id=1096376 https://bugzilla.redhat.com/show_bug.cgi?id=1096377 Reported-by: Patrik Hagara <phagara@redhat.com> Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* filters/ccsflat2pcsprelude[nfsserver]: s/nfsserver/nfspath/Jan Pokorný2015-03-161-4/+4
| | | | | | | (Also fix a minor s/nfserver/nfsserver/ typo.) Reported-by: Patrik Hagara <phagara@redhat.com> Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* filters/ccsflat2pcsprelude[apache]: fitting value nameJan Pokorný2015-03-161-1/+1
| | | | Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
* filters/ccs2ccsflat: distinguish error code/killing signalJan Pokorný2015-03-161-2/+4
| | | | | | | See https://docs.python.org/2/library/subprocess.html#subprocess.Popen.returncode Signed-off-by: Jan Pokorný <jpokorny@redhat.com>