Merge "Fix keystone charm path setting in test bundles"

2021-12-14 16:13:04 +00:00 · 2021-12-14 16:13:04 +00:00 · b56dd72545
parent 6bf595e5da 5d19a1fab3
commit b56dd72545
12 changed files with 12 additions and 12 deletions
--- a/tests/bundles/bionic-queens.yaml
+++ b/tests/bundles/bionic-queens.yaml
@ -23,7 +23,7 @@ applications:
    - '0'
  keystone:
    series: bionic
-    charm: ../../../keystone
+    charm: ../../
    num_units: 3
    options:
      token-provider: 'fernet'
--- a/tests/bundles/bionic-rocky.yaml
+++ b/tests/bundles/bionic-rocky.yaml
@ -23,7 +23,7 @@ applications:
    - '0'
  keystone:
    series: bionic
-    charm: ../../../keystone
+    charm: ../../
    num_units: 3
    options:
      openstack-origin: cloud:bionic-rocky
--- a/tests/bundles/bionic-stein.yaml
+++ b/tests/bundles/bionic-stein.yaml
@ -23,7 +23,7 @@ applications:
    - '0'
  keystone:
    series: bionic
-    charm: ../../../keystone
+    charm: ../../
    num_units: 3
    options:
      openstack-origin: cloud:bionic-stein
--- a/tests/bundles/bionic-train.yaml
+++ b/tests/bundles/bionic-train.yaml
@ -23,7 +23,7 @@ applications:
    - '0'
  keystone:
    series: bionic
-    charm: ../../../keystone
+    charm: ../../
    num_units: 3
    options:
      openstack-origin: cloud:bionic-train
--- a/tests/bundles/bionic-ussuri.yaml
+++ b/tests/bundles/bionic-ussuri.yaml
@ -22,7 +22,7 @@ applications:
    to:
    - '0'
  keystone:
-    charm: ../../../keystone
+    charm: ../../
    num_units: 3
    options:
      openstack-origin: cloud:bionic-ussuri
--- a/tests/bundles/focal-ussuri.yaml
+++ b/tests/bundles/focal-ussuri.yaml
@ -35,7 +35,7 @@ applications:
      - '2'

  keystone:
-    charm: ../../../keystone
+    charm: ../../
    num_units: 3
    options:
      openstack-origin: *openstack-origin
--- a/tests/bundles/focal-victoria.yaml
+++ b/tests/bundles/focal-victoria.yaml
@ -35,7 +35,7 @@ applications:
      - '2'

  keystone:
-    charm: ../../../keystone
+    charm: ../../
    num_units: 3
    options:
      openstack-origin: *openstack-origin
--- a/tests/bundles/focal-wallaby.yaml
+++ b/tests/bundles/focal-wallaby.yaml
@ -35,7 +35,7 @@ applications:
      - '2'

  keystone:
-    charm: ../../../keystone
+    charm: ../../
    num_units: 3
    options:
      openstack-origin: *openstack-origin
--- a/tests/bundles/focal-xena.yaml
+++ b/tests/bundles/focal-xena.yaml
@ -35,7 +35,7 @@ applications:
      - '2'

  keystone:
-    charm: ../../../keystone
+    charm: ../../
    num_units: 3
    options:
      openstack-origin: *openstack-origin
--- a/tests/bundles/hirsute-wallaby.yaml
+++ b/tests/bundles/hirsute-wallaby.yaml
@ -35,7 +35,7 @@ applications:
      - '2'

  keystone:
-    charm: ../../../keystone
+    charm: ../../
    num_units: 3
    options:
      openstack-origin: *openstack-origin
--- a/tests/bundles/impish-xena.yaml
+++ b/tests/bundles/impish-xena.yaml
@ -35,7 +35,7 @@ applications:
      - '2'

  keystone:
-    charm: ../../../keystone
+    charm: ../../
    num_units: 3
    options:
      openstack-origin: *openstack-origin
--- a/tests/bundles/jammy-yoga.yaml
+++ b/tests/bundles/jammy-yoga.yaml
@ -35,7 +35,7 @@ applications:
      - '2'

  keystone:
-    charm: ../../../keystone
+    charm: ../../
    num_units: 3
    options:
      openstack-origin: *openstack-origin