Fix ambiguous relation

cinder-ceph/ceph-mon could now refer to: - ceph/client - ceph-replication-device/client - juju-info/juju-info Change-Id: Id39640c0084992284a976c3cb02233e3ae6e20fb
2021-01-12 10:54:49 +01:00 · 2021-01-12 10:54:49 +01:00 · 979c39c532
parent 3562e11bda
commit 979c39c532
13 changed files with 26 additions and 26 deletions
--- a/src/tests/bundles/bionic-queens-e2e-lxd.yaml
+++ b/src/tests/bundles/bionic-queens-e2e-lxd.yaml
@ -165,8 +165,8 @@ relations:
  - cinder
 - - cinder
  - cinder-ceph
- - cinder-ceph
-  - ceph-mon
+- - cinder-ceph:ceph
+  - ceph-mon:client
 - - ceph-mon:osd
  - ceph-osd:mon
 - - ceph-mon
--- a/src/tests/bundles/bionic-queens-e2e.yaml
+++ b/src/tests/bundles/bionic-queens-e2e.yaml
@ -165,8 +165,8 @@ relations:
  - cinder
 - - cinder
  - cinder-ceph
- - cinder-ceph
-  - ceph-mon
+- - cinder-ceph:ceph
+  - ceph-mon:client
 - - ceph-mon:osd
  - ceph-osd:mon
 - - ceph-mon
--- a/src/tests/bundles/bionic-queens.yaml
+++ b/src/tests/bundles/bionic-queens.yaml
@ -87,8 +87,8 @@ relations:
  - glance
 - - cinder
  - cinder-ceph
- - cinder-ceph
-  - ceph-mon
+- - cinder-ceph:ceph
+  - ceph-mon:client
 - - nova-compute:ceph-access
  - cinder-ceph:ceph-access
 - - nova-compute:amqp
--- a/src/tests/bundles/bionic-rocky-site-a.yaml
+++ b/src/tests/bundles/bionic-rocky-site-a.yaml
@ -70,8 +70,8 @@ relations:
  - glance
 - - cinder
  - cinder-ceph
- - cinder-ceph
-  - ceph-mon
+- - cinder-ceph:ceph
+  - ceph-mon:client
 - - nova-compute:ceph-access
  - cinder-ceph:ceph-access
 - - nova-compute:amqp
--- a/src/tests/bundles/bionic-rocky.yaml
+++ b/src/tests/bundles/bionic-rocky.yaml
@ -90,8 +90,8 @@ relations:
  - glance
 - - cinder
  - cinder-ceph
- - cinder-ceph
-  - ceph-mon
+- - cinder-ceph:ceph
+  - ceph-mon:client
 - - nova-compute:ceph-access
  - cinder-ceph:ceph-access
 - - nova-compute:amqp
--- a/src/tests/bundles/bionic-stein.yaml
+++ b/src/tests/bundles/bionic-stein.yaml
@ -90,8 +90,8 @@ relations:
  - glance
 - - cinder
  - cinder-ceph
- - cinder-ceph
-  - ceph-mon
+- - cinder-ceph:ceph
+  - ceph-mon:client
 - - nova-compute:ceph-access
  - cinder-ceph:ceph-access
 - - nova-compute:amqp
--- a/src/tests/bundles/bionic-train.yaml
+++ b/src/tests/bundles/bionic-train.yaml
@ -92,8 +92,8 @@ relations:
  - glance
 - - cinder
  - cinder-ceph
- - cinder-ceph
-  - ceph-mon
+- - cinder-ceph:ceph
+  - ceph-mon:client
 - - nova-compute:ceph-access
  - cinder-ceph:ceph-access
 - - nova-compute:amqp
--- a/src/tests/bundles/bionic-ussuri.yaml
+++ b/src/tests/bundles/bionic-ussuri.yaml
@ -92,8 +92,8 @@ relations:
  - glance
 - - cinder
  - cinder-ceph
- - cinder-ceph
-  - ceph-mon
+- - cinder-ceph:ceph
+  - ceph-mon:client
 - - nova-compute:ceph-access
  - cinder-ceph:ceph-access
 - - nova-compute:amqp
--- a/src/tests/bundles/focal-ussuri.yaml
+++ b/src/tests/bundles/focal-ussuri.yaml
@ -194,8 +194,8 @@ relations:
  - - 'cinder'
    - 'cinder-ceph'

-  - - 'cinder-ceph'
-    - 'ceph-mon'
+  - - 'cinder-ceph:ceph'
+    - 'ceph-mon:client'

  - - 'nova-compute:ceph-access'
    - 'cinder-ceph:ceph-access'
--- a/src/tests/bundles/focal-victoria.yaml
+++ b/src/tests/bundles/focal-victoria.yaml
@ -139,8 +139,8 @@ relations:

 - - cinder
  - cinder-ceph
- - cinder-ceph
-  - ceph-mon
+- - cinder-ceph:ceph
+  - ceph-mon:client

 - - nova-compute:ceph-access
  - cinder-ceph:ceph-access
--- a/src/tests/bundles/groovy-victoria.yaml
+++ b/src/tests/bundles/groovy-victoria.yaml
@ -138,8 +138,8 @@ relations:

 - - cinder
  - cinder-ceph
- - cinder-ceph
-  - ceph-mon
+- - cinder-ceph:ceph
+  - ceph-mon:client

 - - nova-compute:ceph-access
  - cinder-ceph:ceph-access
--- a/src/tests/bundles/xenial-pike.yaml
+++ b/src/tests/bundles/xenial-pike.yaml
@ -90,8 +90,8 @@ relations:
  - glance
 - - cinder
  - cinder-ceph
- - cinder-ceph
-  - ceph-mon
+- - cinder-ceph:ceph
+  - ceph-mon:client
 - - nova-compute:ceph-access
  - cinder-ceph:ceph-access
 - - nova-compute:amqp
--- a/src/tests/bundles/xenial-queens.yaml
+++ b/src/tests/bundles/xenial-queens.yaml
@ -90,8 +90,8 @@ relations:
  - glance
 - - cinder
  - cinder-ceph
- - cinder-ceph
-  - ceph-mon
+- - cinder-ceph:ceph
+  - ceph-mon:client
 - - nova-compute:ceph-access
  - cinder-ceph:ceph-access
 - - nova-compute:amqp