diff options
| -rw-r--r-- | filters/_2pcscmd.py | 4 | ||||
| -rw-r--r-- | filters/cluster/clusternodes/clusternode/__init__.py | 2 | ||||
| -rw-r--r-- | filters/cluster/cman/__init__.py | 2 | ||||
| -rw-r--r-- | filters/cluster/rm/__init__.py | 9 | ||||
| -rw-r--r-- | filters/cluster/rm/nfsclient/__init__.py | 6 | ||||
| -rw-r--r-- | filters/cluster/rm/script/__init__.py | 4 | ||||
| -rw-r--r-- | tests/filters/ccsflat2cibprelude.py | 4 |
7 files changed, 16 insertions, 15 deletions
diff --git a/filters/_2pcscmd.py b/filters/_2pcscmd.py index 4a2e654..9b8a961 100644 --- a/filters/_2pcscmd.py +++ b/filters/_2pcscmd.py @@ -130,8 +130,8 @@ def coro2pcscmd(**kwargs): ''') % dict( NL=NL, msg_enable="NOTE: cluster infrastructure services not enabled" - " at this point, which can be changed any time by issuing:" - " pcs cluster enable --all", + " at this point, which can be changed any time by issuing" + " `pcs cluster enable --all`", **dict(('descent_' + k, descent(k)) for k in ('cman', 'node', 'quorum', 'totem')) ) diff --git a/filters/cluster/clusternodes/clusternode/__init__.py b/filters/cluster/clusternodes/clusternode/__init__.py index f802e4e..9fc2938 100644 --- a/filters/cluster/clusternodes/clusternode/__init__.py +++ b/filters/cluster/clusternodes/clusternode/__init__.py @@ -38,7 +38,7 @@ ccs2needlexml = '''\ </xsl:otherwise> </xsl:choose> <xsl:value-of select="concat(' hence not propagated (as', - ' quorum_votes property)')"/> + ' `quorum_votes` property)')"/> </xsl:message> </xsl:when> <xsl:otherwise> diff --git a/filters/cluster/cman/__init__.py b/filters/cluster/cman/__init__.py index f65b859..1888fec 100644 --- a/filters/cluster/cman/__init__.py +++ b/filters/cluster/cman/__init__.py @@ -20,7 +20,7 @@ ccs2needlexml = '''\ <xsl:if test="@expected_votes"> <xsl:message> <xsl:value-of select="concat('WARNING: intentionally omitting', - ' expected_votes parameter as it', + ' `expected_votes` parameter as it', ' may be based on assumptions', ' no longer true in post-conversion', ' environment')"/> diff --git a/filters/cluster/rm/__init__.py b/filters/cluster/rm/__init__.py index 0bd6adf..fca0ba8 100644 --- a/filters/cluster/rm/__init__.py +++ b/filters/cluster/rm/__init__.py @@ -259,10 +259,11 @@ ccsflat2cibprelude = ('''\ <clufter:descent at="failoverdomain"/> ''') % dict( package_name=package_name(), - note_unhandled='''<xsl:value-of select="concat('WARNING: resource ', name(), - ' is currently unhandled by', - ' the conversion, you are', - ' advised to copy ', + note_unhandled='''<xsl:value-of select="concat('WARNING: resource `', + name(), + '` is currently unhandled', + ' in the conversion, you', + ' are advised to copy ', substring-before( @rgmanager-meta-agent, '.metadata' diff --git a/filters/cluster/rm/nfsclient/__init__.py b/filters/cluster/rm/nfsclient/__init__.py index 8431ee9..85f7fa8 100644 --- a/filters/cluster/rm/nfsclient/__init__.py +++ b/filters/cluster/rm/nfsclient/__init__.py @@ -43,8 +43,8 @@ ccsflat2cibprelude = ('''\ </xsl:when> ''') % dict( note=', '.join(( - squote("NOTE: explicitly disabling unlock_on_stop parameter so as to" - " preserve original behavior;"), - squote(" you may want to enable it, though"), + squote("NOTE: explicitly disabling `unlock_on_stop` parameter for"), + squote(" `exportfs` resource so as to preserve original `nfsclient`"), + squote(" resource behavior; you may want to enable it, though"), )) ) diff --git a/filters/cluster/rm/script/__init__.py b/filters/cluster/rm/script/__init__.py index 158a4a5..c856c96 100644 --- a/filters/cluster/rm/script/__init__.py +++ b/filters/cluster/rm/script/__init__.py @@ -36,9 +36,9 @@ ccsflat2cibprelude = ('''\ </xsl:when> ''') % dict( note=', '.join(( - squote("NOTE: consider moving "), + squote("NOTE: consider moving `"), "@file", - squote(" into canonical LSB scripts location (standard: /etc/init.d/)" + squote("` into canonical LSB scripts location (standard: `/etc/init.d/`)" " + reflecting this in the configuration, perhaps even" " switching to an equivalent (systemd, anything OCF RA, ...)") )) diff --git a/tests/filters/ccsflat2cibprelude.py b/tests/filters/ccsflat2cibprelude.py index 7953b1e..3e30640 100644 --- a/tests/filters/ccsflat2cibprelude.py +++ b/tests/filters/ccsflat2cibprelude.py @@ -22,7 +22,7 @@ class FiltersCcsFlat2CibPreludeTestCase(TeardownFilterTestCase): <instance_attributes id="RESOURCE-nfsclient-test1-ATTRS"> <nvpair id="RESOURCE-nfsclient-test1-ATTRS-clientspec" name="clientspec" value="*"/> <nvpair id="RESOURCE-nfsclient-test1-ATTRS-directory" name="directory" value="/srv/nfs/test1"/> - <!-- NOTE: explicitly disabling unlock_on_stop parameter so as to preserve original behavior; you may want to enable it, though --> + <!-- NOTE: explicitly disabling `unlock_on_stop` parameter for `exportfs` resource so as to preserve original `nfsclient` resource behavior; you may want to enable it, though --> <nvpair id="RESOURCE-nfsclient-test1-ATTRS-unlock_on_stop" name="unlock_on_stop" value="false"/> </instance_attributes> <meta_attributes id="RESOURCE-nfsclient-test1-META"> @@ -38,7 +38,7 @@ class FiltersCcsFlat2CibPreludeTestCase(TeardownFilterTestCase): <nvpair id="RESOURCE-nfsclient-test2-ATTRS-clientspec" name="clientspec" value="*"/> <nvpair id="RESOURCE-nfsclient-test2-ATTRS-directory" name="directory" value="/srv/nfs/test2"/> <nvpair id="RESOURCE-nfsclient-test2-ATTRS-options" name="options" value="rw,async,no_root_squash"/> - <!-- NOTE: explicitly disabling unlock_on_stop parameter so as to preserve original behavior; you may want to enable it, though --> + <!-- NOTE: explicitly disabling `unlock_on_stop` parameter for `exportfs` resource so as to preserve original `nfsclient` resource behavior; you may want to enable it, though --> <nvpair id="RESOURCE-nfsclient-test2-ATTRS-unlock_on_stop" name="unlock_on_stop" value="false"/> </instance_attributes> <meta_attributes id="RESOURCE-nfsclient-test2-META"> |