Merge ~ec0/juju-lint:add-policy-routing into juju-lint:master

[James Hebden]

Add policy routing and other optional subordinates to optional subordinates and openstack operations charms the the contrib Canonical rules

Update optional and mandatory operations and OpenStack-specific operational charms in the Canonical contributed rules

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

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

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision b8b40d11bf5d7629659dff20e94cc933e091a403

diff --git a/contrib/canonical-rules.yaml b/contrib/canonical-rules.yaml
index 1d9c07c..8e7a250 100644
--- a/contrib/canonical-rules.yaml
+++ b/contrib/canonical-rules.yaml
@@ -88,8 +88,16 @@ operations mandatory: &operations-mandatory-charms
  - graylog
  - landscape-server
  - nagios
- - openstack-service-checks
  - prometheus2
+
+operations optional: &operations-optional-charms
+ - infra-node
+ - hw-health
+ - cloudstats
+
+operations openstack mandatory: &operations-openstack-mandatory-charms
+ - openstack-service-checks
+ - prometheus-libvirt-exporter
  - prometheus-openstack-exporter
  - prometheus-ceph-exporter
 
@@ -107,10 +115,19 @@ operations subordinates: &operations-mandatory-subs
  - telegraf
  - thruk-agent
 
+operations optional subordinates: &operations-optional-subs
+ - policy-routing
+ - bcache-tuning
+ - sysconfig
+ - logrotate-charm
+
 operations charms: &operations-charms
  - *operations-mandatory-charms
  - *operations-mandatory-deps
  - *operations-mandatory-subs
+ - *operations-optional-charms
+ - *operations-optional-subs
+ - *operations-openstack-mandatory-charms
 
 openstack mandatory: &openstack-mandatory-charms
  - ceilometer
diff --git a/jujulint/lint.py b/jujulint/lint.py
index a132541..6e6a1b0 100755
--- a/jujulint/lint.py
+++ b/jujulint/lint.py
@@ -569,6 +569,13 @@ class Linter:
                             self.controller_name,
                         )
                     )
+            for charm in self.lint_rules["operations openstack mandatory"]:
+                if charm not in self.model.charms:
+                    self.logger.error(
+                        "[{}] Ops charm '{}' in OpenStack model {} on controller {} not found".format(
+                            self.cloud_name, charm, self.model_name, self.controller_name
+                        )
+                    )
         elif self.cloud_type == "kubernetes":
             for charm in self.lint_rules["kubernetes mandatory"]:
                 if charm not in self.model.charms:
diff --git a/requirements.txt b/requirements.txt
index 9527545..5b51974 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+paramiko>=2.7.2
 attrs>=18.1.0
 colorlog>=4.1.0
 confuse>=1.1.0
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 9ec50ef..a24b8d2 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 ---
 name: juju-lint
-base: core18
+base: core20
 summary: Linter for Juju models to compare deployments with configurable policy
 adopt-info: juju-lint
 description: |
@@ -11,14 +11,13 @@ grade: stable
 confinement: classic
 apps:
   juju-lint:
-    command: juju-lint
+    command: bin/juju-lint
     environment:
       PATH: "/snap/juju-lint/current/bin:/snap/juju-lint/current/usr/bin:/bin:/usr/bin:"
       PYTHONPATH: $SNAP/usr/lib/python3.6/site-packages:$SNAP/usr/lib/python3.6/dist-packages:$PYTHONPATH
 parts:
   juju-lint:
     plugin: python
-    python-version: python3
     requirements:
       - requirements.txt
     source: .