Merge ~mertkirpici/juju-lint:lp/1903973 into juju-lint:master

Proposed by Mert Kirpici
Status: Merged
Approved by: Robert Gildein
Approved revision: 781eb217164c44206ef48dbaab8a3a51e3400ca1
Merged at revision: 10e3c65e4507e577dc88ca8c89855e750f919234
Proposed branch: ~mertkirpici/juju-lint:lp/1903973
Merge into: juju-lint:master
Diff against target: 26 lines (+2/-2)
2 files modified
contrib/canonical-rules.yaml (+1/-1)
jujulint/lint.py (+1/-1)
Reviewer Review Type Date Requested Status
Robert Gildein Approve
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
Andrea Ieri Approve
Review via email: mp+452569@code.launchpad.net

Commit message

LP #1903973

Description of the change

fix: declare hw-health to be metal only

The canonical-rules ruleset was skipped during the first handling of this issue

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Ieri (aieri) wrote :

LGTM

review: Approve
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Approve (continuous-integration)
Revision history for this message
Robert Gildein (rgildein) wrote :

LGTM

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 10e3c65e4507e577dc88ca8c89855e750f919234

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/contrib/canonical-rules.yaml b/contrib/canonical-rules.yaml
index 05982c5..4190af6 100644
--- a/contrib/canonical-rules.yaml
+++ b/contrib/canonical-rules.yaml
@@ -96,7 +96,7 @@ subordinates:
96 thruk-agent:96 thruk-agent:
97 where: on nagios97 where: on nagios
98 hw-health:98 hw-health:
99 where: host only99 where: metal only
100 logrotated:100 logrotated:
101 where: all101 where: all
102 local-users:102 local-users:
diff --git a/jujulint/lint.py b/jujulint/lint.py
index 5f764a9..8fa3f97 100755
--- a/jujulint/lint.py
+++ b/jujulint/lint.py
@@ -237,7 +237,7 @@ class Linter:
237 If the input value does not match the expected format, it is returned237 If the input value does not match the expected format, it is returned
238 without the change.238 without the change.
239 """239 """
240 if type(val) != str:240 if not isinstance(val, str):
241 return val241 return val
242242
243 try:243 try:

Subscribers

People subscribed via source and target branches