Merge ~aieri/juju-lint:linting into juju-lint:master

Proposed by Andrea Ieri
Status: Merged
Approved by: Andrea Ieri
Approved revision: aa057392dc11b547b4308505c7116d1755797624
Merged at revision: 13fa6dadc12a4810677b55911b995b416167c7cc
Proposed branch: ~aieri/juju-lint:linting
Merge into: juju-lint:master
Diff against target: 67 lines (+9/-11)
1 file modified
contrib/canonical-rules.yaml (+9/-11)
Reviewer Review Type Date Requested Status
Dan Ackerson (community) Approve
Xav Paice (community) Approve
Review via email: mp+398079@code.launchpad.net

Commit message

[trivial] make yamllint happy

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
Xav Paice (xavpaice) wrote :

lgtm.

review: Approve
Revision history for this message
Dan Ackerson (dan.ackerson) wrote :

lgtm2

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

Change successfully merged at revision 13fa6dadc12a4810677b55911b995b416167c7cc

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 c125397..7f4bfbf 100644
--- a/contrib/canonical-rules.yaml
+++ b/contrib/canonical-rules.yaml
@@ -1,3 +1,4 @@
1---
1kubernetes config:2kubernetes config:
2 kubernetes-master:3 kubernetes-master:
3 authorization-mode:4 authorization-mode:
@@ -40,11 +41,6 @@ openstack config:
40 gte: 6G41 gte: 6G
41 max-connections:42 max-connections:
42 gte: 200043 gte: 2000
43 mysql-innodb-cluster:
44 innodb-buffer-pool-size:
45 gte: 6G
46 max-connections:
47 gte: 2000
48 rabbitmq-server:44 rabbitmq-server:
49 cluster-partition-handling:45 cluster-partition-handling:
50 eq: "pause_minority"46 eq: "pause_minority"
@@ -52,8 +48,8 @@ openstack config:
52 token-expiration:48 token-expiration:
53 gte: 8640049 gte: 86400
54 sysconfig:50 sysconfig:
55 governor:51 governor:
56 eq: "performance"52 eq: "performance"
57 ovn-central:53 ovn-central:
58 ovsdb-server-election-timer:54 ovsdb-server-election-timer:
59 gte: 455 gte: 4
@@ -71,7 +67,8 @@ config:
7167
72subordinates:68subordinates:
73 telegraf:69 telegraf:
74 where: all except prometheus # and prometheus-ceph-exporter and prometheus-openstack-exporter70 where: all except prometheus
71 # and prometheus-ceph-exporter and prometheus-openstack-exporter
75 landscape-client:72 landscape-client:
76 where: all except landscape-server73 where: all except landscape-server
77 filebeat:74 filebeat:
@@ -84,12 +81,13 @@ subordinates:
84 container-suffixes: [lxd, container]81 container-suffixes: [lxd, container]
85 exceptions: [nagios]82 exceptions: [nagios]
86 ntp:83 ntp:
87 where: host only # You don't want NTP in a container duelling with ntp in the host84 # You don't want NTP in a container dueling with ntp in the host
85 where: host only
88 thruk-agent:86 thruk-agent:
89 where: on nagios87 where: on nagios
90 hw-health:88 hw-health:
91 where: host only89 where: host only
92 logrotated:90 logrotate:
93 where: all91 where: all
9492
95operations mandatory: &operations-mandatory-charms93operations mandatory: &operations-mandatory-charms
@@ -182,7 +180,7 @@ openstack optional charms: &openstack-optional-charms
182 - glance-sync-slave180 - glance-sync-slave
183 - gnocchi181 - gnocchi
184 - keystone-ldap182 - keystone-ldap
185 - mongodb # Optional since Gnochii183 - mongodb # Optional since Gnocchi
186 - neutron-gateway184 - neutron-gateway
187 - octavia185 - octavia
188 - octavia-dashboard186 - octavia-dashboard

Subscribers

People subscribed via source and target branches