diff options
| author | Jan Pokorný <jpokorny@redhat.com> | 2015-12-16 22:51:04 +0100 |
|---|---|---|
| committer | Jan Pokorný <jpokorny@redhat.com> | 2015-12-17 23:39:09 +0100 |
| commit | 2e3dd0ec5075c4892c44bfd5d4cd2f7cad409d57 (patch) | |
| tree | 61a104810a5e5dda253b3f3ba882993b6607bcce | |
| parent | b750ea1e19807bdfc5422714a6f0a00c6293dfe0 (diff) | |
| download | clufter-2e3dd0ec5075c4892c44bfd5d4cd2f7cad409d57.tar.gz clufter-2e3dd0ec5075c4892c44bfd5d4cd2f7cad409d57.tar.xz clufter-2e3dd0ec5075c4892c44bfd5d4cd2f7cad409d57.zip | |
filters/ccsflat2cibprelude[rm]: forget about undeployed resources
This was actually a conversion bug in that these unused (just declared)
resources were promoted into ones effectively executed under new stack.
Alternative solution would be to keep them included as it used to be
plus set "is-managed" meta-attribute for them to "false", but there is
at least one deeper underlying issue: ccs_flatten is not interested in
these unemployed items in the "resources" stanza at all (they are not
validated, nor they are paired with metadata-provided defaults, etc.).
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
| -rw-r--r-- | filters/cluster/rm/__init__.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/filters/cluster/rm/__init__.py b/filters/cluster/rm/__init__.py index 4b22889..fc7522c 100644 --- a/filters/cluster/rm/__init__.py +++ b/filters/cluster/rm/__init__.py @@ -101,19 +101,15 @@ ccsflat2cibprelude_elems_res_toplevel = ccsflat2cibprelude_elems_res_hybrid + ( 'service', ) -ccsflat2cibprelude_elems_with_res = ccsflat2cibprelude_elems_res_toplevel + ( - 'resources', -) - ccsflat2cibprelude = ('''\ <xsl:for-each select="*[ ''' + ( - xslt_is_member('name()', ccsflat2cibprelude_elems_res_hybrid) + xslt_is_member('name()', ccsflat2cibprelude_elems_res_hybrid) ) + '''] | *[ ''' + ( - xslt_is_member('name()', ccsflat2cibprelude_elems_with_res) + xslt_is_member('name()', ccsflat2cibprelude_elems_res_toplevel) ) + ''']/*[name() != 'action']"> <!-- meta-primary can be, e.g., @address in case of ip, and that can contain '/' which is not NCNameChar --> |