Merge ~elmo/juju-lint:master into juju-lint:master

[James Troup]

[Xav Paice] Updates to lint rules for recent fcb delivery

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

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

[Xav Paice (xavpaice)]

LGTM, tests fine

review: Approve

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

Change successfully merged at revision 70ae62042d302b729477868bfc5a64e93047f3a2

diff --git a/contrib/canonical-openstack-rules.yaml b/contrib/canonical-openstack-rules.yaml
index 833c229..a5c05cf 100644
--- a/contrib/canonical-openstack-rules.yaml
+++ b/contrib/canonical-openstack-rules.yaml
@@ -1,22 +1,21 @@
 subordinates:
  telegraf:
-  where: all
+  where: all except prometheus  # and prometheus-ceph-exporter and prometheus-openstack-exporter
+  host-suffixes: [prometheus]
  landscape-client:
-  where: all
+  where: all except landscape-server
  filebeat:
-  where: all
+  where: all except graylog
  canonical-livepatch:
   where: host only
  nrpe:
-  where: container aware
+  where: container aware  # and except nagios
   host-suffixes: [host, physical]
   container-suffixes: [lxd, container]
  ntp:
   where: host only # You don't want NTP in a container duelling with ntp in the host
  thruk-agent:
   where: on nagios
- prometheus-ceph-exporter:
-  where: on ceph-mon
 
 operations mandatory: &operations-mandatory-charms
  - elasticsearch
@@ -25,8 +24,9 @@ operations mandatory: &operations-mandatory-charms
  - landscape-server
  - nagios
  - openstack-service-checks
- - prometheus
+ - prometheus2
  - prometheus-openstack-exporter
+ - prometheus-ceph-exporter
 
 operations mandatory dependencies: &operations-mandatory-deps
  - postgresql
@@ -39,7 +39,6 @@ operations subordinates: &operations-mandatory-subs
  - lldpd
  - nrpe
  - ntp
- - prometheus-ceph-exporter
  - telegraf
  - thruk-agent
 
@@ -54,7 +53,6 @@ openstack mandatory: &openstack-mandatory-charms
  - ceph-mon
  - ceph-osd
  - cinder
- - cinder-backup
  - cinder-ceph
  - glance
  - heat
@@ -87,6 +85,10 @@ openstack optional charms: &openstack-optional-charms
  - neutron-gateway
  - swift-proxy
  - swift-storage
+ - cinder-backup
+ - vault
+ - etcd
+ - easyrsa
 
 cisco-aci-charms: &cisco-aci-charms
  - neutron-api-plugin-aci
diff --git a/jujulint.py b/jujulint.py
index 05d68b0..81cc53b 100755
--- a/jujulint.py
+++ b/jujulint.py
@@ -15,7 +15,6 @@ import attr
 
 # TODO:
 #  - tests
-#  - prometheus vs prometheus2
 #  - non-OK statuses?
 #  - missing relations for mandatory subordinates
 #  - info mode, e.g. num of machines, version (e.g. look at ceph), architecture
@@ -141,14 +140,21 @@ def check_subs(model, lint_rules):
         for machine in model.subs_on_machines:
             logging.debug("Checking on %s" % (machine))
             present_subs = model.subs_on_machines[machine]
-            if where.startswith("on "):  # only on specific machines
+            apps = model.apps_on_machines[machine]
+            if where.startswith("on "):  # only on specific apps
                 logging.debug("requirement is = form...")
                 required_on = where[3:]
-                machine_name = machine.split("/")[0]
-                if machine_name != required_on:
+                if required_on not in apps:
                     logging.debug("... NOT matched")
                     continue
                 logging.debug("... matched")
+            # TODO this needs to be not just one app, but a list
+            elif where.startswith("all except "):  # not next to this app
+                logging.debug("requirement is != form...")
+                not_on = where[11:]
+                if not_on in apps:
+                    logging.debug("... matched, not wanted on this host")
+                    continue
             elif where == "host only":
                 logging.debug("requirement is 'host only' form....")
                 if is_container(machine):