openstack
/
charm-swift-storage
Code Issues Proposed changes

Workaround for Juju bug 1860992 

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

Change-Id: Ia3019c9d8b905b80d5a44691607bb8a9ea20fe9d
This commit is contained in:
Liam Young 2020-01-29 10:04:27 +00:00
parent 1d9afb103d
commit b8cc274f9a
2 changed files with 10 additions and 10 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,30 +1,30 @@
applications:
keystone:
offers:
keystone-offer:
keystone:
endpoints:
- identity-service
swift-proxy-region1:
offers:
swift-proxy-region1-offer:
swift-proxy-region1:
endpoints:
- swift-storage
- rings-distributor
swift-storage-region1-zone1:
charm: {{ charm_location }}
offers:
swift-storage-region1-zone1-offer:
swift-storage-region1-zone1:
endpoints:
- swift-storage
swift-storage-region1-zone2:
charm: {{ charm_location }}
offers:
swift-storage-region1-zone2-offer:
swift-storage-region1-zone2:
endpoints:
- swift-storage
swift-storage-region1-zone3:
charm: {{ charm_location }}
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

@ -24,12 +24,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