Juju Lint

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

  1. Git
  2. lp:~aieri/juju-lint
  3. linting
  4. Merge into 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
1diff --git a/contrib/canonical-rules.yaml b/contrib/canonical-rules.yaml
2index c125397..7f4bfbf 100644
3--- a/contrib/canonical-rules.yaml
4+++ b/contrib/canonical-rules.yaml
5@@ -1,3 +1,4 @@
6+---
7 kubernetes config:
8 kubernetes-master:
9 authorization-mode:
10@@ -40,11 +41,6 @@ openstack config:
11 gte: 6G
12 max-connections:
13 gte: 2000
14- mysql-innodb-cluster:
15- innodb-buffer-pool-size:
16- gte: 6G
17- max-connections:
18- gte: 2000
19 rabbitmq-server:
20 cluster-partition-handling:
21 eq: "pause_minority"
22@@ -52,8 +48,8 @@ openstack config:
23 token-expiration:
24 gte: 86400
25 sysconfig:
26- governor:
27- eq: "performance"
28+ governor:
29+ eq: "performance"
30 ovn-central:
31 ovsdb-server-election-timer:
32 gte: 4
33@@ -71,7 +67,8 @@ config:
34
35 subordinates:
36 telegraf:
37- where: all except prometheus # and prometheus-ceph-exporter and prometheus-openstack-exporter
38+ where: all except prometheus
39+ # and prometheus-ceph-exporter and prometheus-openstack-exporter
40 landscape-client:
41 where: all except landscape-server
42 filebeat:
43@@ -84,12 +81,13 @@ subordinates:
44 container-suffixes: [lxd, container]
45 exceptions: [nagios]
46 ntp:
47- where: host only # You don't want NTP in a container duelling with ntp in the host
48+ # You don't want NTP in a container dueling with ntp in the host
49+ where: host only
50 thruk-agent:
51 where: on nagios
52 hw-health:
53 where: host only
54- logrotated:
55+ logrotate:
56 where: all
57
58 operations mandatory: &operations-mandatory-charms
59@@ -182,7 +180,7 @@ openstack optional charms: &openstack-optional-charms
60 - glance-sync-slave
61 - gnocchi
62 - keystone-ldap
63- - mongodb # Optional since Gnochii
64+ - mongodb # Optional since Gnocchi
65 - neutron-gateway
66 - octavia
67 - octavia-dashboard

Subscribers

People subscribed via source and target branches