openstack
/
charm-swift-proxy
Code Issues Proposed changes

Workaround for Juju bug 1860992 

Change CMR offer names to match application names to workaround
Juju bug 1860992.

Change-Id: Idce188397884521e686c2ea201e671a6557d4bf2
This commit is contained in:
Liam Young 2020-01-29 10:00:47 +00:00
parent 8b1743129d
commit cd872e79e7
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/bundles/overlays/bionic-train-gr-r1.yaml.j2
View File

@ -1,28 +1,28 @@
applications:
keystone:
offers:
keystone-offer:
keystone:
endpoints:
- identity-service
swift-proxy-region1:
charm: {{ charm_location }}
offers:
swift-proxy-region1-offer:
swift-proxy-region1:
endpoints:
- swift-storage
- rings-distributor
swift-storage-region1-zone1:
offers:
swift-storage-region1-zone1-offer:
swift-storage-region1-zone1:
endpoints:
- swift-storage
swift-storage-region1-zone2:
offers:
swift-storage-region1-zone2-offer:
swift-storage-region1-zone2:
endpoints:
- swift-storage
swift-storage-region1-zone3:
offers:
swift-storage-region1-zone3-offer:
swift-storage-region1-zone3:
endpoints:
- swift-storage

10
tests/bundles/overlays/bionic-train-gr-r2.yaml.j2
View File

@ -20,12 +20,12 @@ relations:
- swift-proxy-region1:rings-distributor
saas:
keystone:
url: admin/{{ swift_gr_region1 }}.keystone-offer
url: admin/{{ swift_gr_region1 }}.keystone
swift-proxy-region1:
url: admin/{{ swift_gr_region1 }}.swift-proxy-region1-offer
url: admin/{{ swift_gr_region1 }}.swift-proxy-region1
swift-storage-region1-zone1:
url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone1-offer
url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone1
swift-storage-region1-zone2:
url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone2-offer
url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone2
swift-storage-region1-zone3:
url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone3-offer
url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone3

3
tests/tests.yaml
View File

@ -9,14 +9,11 @@ gate_bundles:
- xenial-ocata
- xenial-mitaka
- trusty-mitaka
- disco-stein
- bionic-train-gr:
- swift_gr_region1: bionic-train-gr-r1
- swift_gr_region2: bionic-train-gr-r2
smoke_bundles:
- bionic-train
dev_bundles:
- disco-stein
configure:
- swift_gr_region1:
- zaza.openstack.charm_tests.swift.setup.wait_for_region2