Merge ~peppepetra/juju-lint:jammy-yoga-cos into juju-lint:master

Proposed by Giuseppe Petralia
Status: Work in progress
Proposed branch: ~peppepetra/juju-lint:jammy-yoga-cos
Merge into: juju-lint:master
Diff against target: 113 lines (+65/-1)
6 files modified
contrib/fcb-yoga-jammy-cos.yaml (+10/-0)
contrib/fcb-yoga-jammy.yaml (+1/-0)
contrib/includes/aggregator-openstack-cos.yaml (+30/-0)
contrib/includes/aggregator-openstack.yaml (+3/-0)
contrib/includes/base.yaml (+1/-1)
contrib/includes/openstack-cos.yaml (+20/-0)
Reviewer Review Type Date Requested Status
BootStack Reviewers Pending
Review via email: mp+455377@code.launchpad.net
To post a comment you must log in.
~peppepetra/juju-lint:jammy-yoga-cos updated
97db16c... by Giuseppe Petralia

Add cos-proxy relations check

Unmerged commits

97db16c... by Giuseppe Petralia

Add cos-proxy relations check

1229092... by Giuseppe Petralia

Initial structure for validating jammy yoga cos

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/contrib/fcb-yoga-jammy-cos.yaml b/contrib/fcb-yoga-jammy-cos.yaml
0new file mode 1006440new file mode 100644
index 0000000..855109f
--- /dev/null
+++ b/contrib/fcb-yoga-jammy-cos.yaml
@@ -0,0 +1,10 @@
1!include includes/base.yaml
2!include includes/networking/ovn.yaml
3!include includes/database/mysql.yaml
4!include includes/release/yoga.yaml
5!include includes/series/jammy.yaml
6!include includes/openstack.yaml
7!include includes/operations.yaml
8!include includes/saas.yaml
9!include includes/openstack-cos.yaml
10!include includes/aggregator-openstack-cos.yaml
diff --git a/contrib/fcb-yoga-jammy.yaml b/contrib/fcb-yoga-jammy.yaml
index bedfc36..80e7a89 100644
--- a/contrib/fcb-yoga-jammy.yaml
+++ b/contrib/fcb-yoga-jammy.yaml
@@ -6,4 +6,5 @@
6!include includes/openstack.yaml6!include includes/openstack.yaml
7!include includes/operations.yaml7!include includes/operations.yaml
8!include includes/saas.yaml8!include includes/saas.yaml
9!include includes/openstack-cos.yaml
9!include includes/aggregator-openstack.yaml10!include includes/aggregator-openstack.yaml
diff --git a/contrib/includes/aggregator-openstack-cos.yaml b/contrib/includes/aggregator-openstack-cos.yaml
10new file mode 10064411new file mode 100644
index 0000000..6ec6d0a
--- /dev/null
+++ b/contrib/includes/aggregator-openstack-cos.yaml
@@ -0,0 +1,30 @@
1operations charms: &operations-charms
2 - *operations-mandatory-charms
3 - *operations-mandatory-deps
4 - *operations-mandatory-subs
5 - *operations-optional-charms
6 - *operations-optional-subs
7 - *operations-openstack-mandatory-charms
8 - *operations-openstack-mandatory-release
9 - *cos-charms
10
11openstack charms: &openstack-charms
12 - *openstack-mandatory-charms
13 - *openstack-mandatory-deps
14 - *openstack-mandatory-subs
15 - *openstack-optional-charms
16 - *openstack-loadbalancer
17 - *cisco-aci-charms
18 - *trilio-charms
19
20known charms:
21 - ubuntu
22 - *openstack-charms
23 - *operations-charms
24
25relations:
26 - *relations-base-check
27 - *relations-cos-check
28
29subordinates:
30 << : [ *subordinates-base-check, *subordinates-cos-check ]
diff --git a/contrib/includes/aggregator-openstack.yaml b/contrib/includes/aggregator-openstack.yaml
index d8c1305..591bc99 100644
--- a/contrib/includes/aggregator-openstack.yaml
+++ b/contrib/includes/aggregator-openstack.yaml
@@ -23,3 +23,6 @@ known charms:
2323
24relations:24relations:
25 - *relations-base-check25 - *relations-base-check
26
27subordinates:
28 << : [ *subordinates-base-check ]
diff --git a/contrib/includes/base.yaml b/contrib/includes/base.yaml
index fc095c4..b8482af 100644
--- a/contrib/includes/base.yaml
+++ b/contrib/includes/base.yaml
@@ -18,7 +18,7 @@ config:
18 disable-unattended-upgrades:18 disable-unattended-upgrades:
19 eq: true19 eq: true
2020
21subordinates:21subordinates base check: &subordinates-base-check
22 telegraf:22 telegraf:
23 where: all except prometheus23 where: all except prometheus
24 # and prometheus-ceph-exporter and prometheus-openstack-exporter24 # and prometheus-ceph-exporter and prometheus-openstack-exporter
diff --git a/contrib/includes/openstack-cos.yaml b/contrib/includes/openstack-cos.yaml
25new file mode 10064425new file mode 100644
index 0000000..196109f
--- /dev/null
+++ b/contrib/includes/openstack-cos.yaml
@@ -0,0 +1,20 @@
1cos charms: &cos-charms
2 - grafana-agent
3 - cos-proxy
4 - hardware-observer
5
6relations cos check: &relations-cos-check
7 - charm: grafana-agent
8 ubiquitous: true
9 - charm: cos-proxy
10 check: [
11 ["nrpe:monitors", "cos-proxy:monitors"],
12 ["cos-proxy:downstream-prometheus-scrape", "scrape-interval-config:configurable-scrape-jobs"]
13 ]
14
15
16subordinates cos check: &subordinates-cos-check
17 grafana-agent:
18 where: container aware
19 host-suffixes: [host, physical, guest]
20 container-suffixes: [lxd, container]
0\ No newline at end of file21\ No newline at end of file

Subscribers

People subscribed via source and target branches