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:
parent
8b1743129d
commit
cd872e79e7
|
@ -1,28 +1,28 @@
|
||||||
applications:
|
applications:
|
||||||
keystone:
|
keystone:
|
||||||
offers:
|
offers:
|
||||||
keystone-offer:
|
keystone:
|
||||||
endpoints:
|
endpoints:
|
||||||
- identity-service
|
- identity-service
|
||||||
swift-proxy-region1:
|
swift-proxy-region1:
|
||||||
charm: {{ charm_location }}
|
charm: {{ charm_location }}
|
||||||
offers:
|
offers:
|
||||||
swift-proxy-region1-offer:
|
swift-proxy-region1:
|
||||||
endpoints:
|
endpoints:
|
||||||
- swift-storage
|
- swift-storage
|
||||||
- rings-distributor
|
- rings-distributor
|
||||||
swift-storage-region1-zone1:
|
swift-storage-region1-zone1:
|
||||||
offers:
|
offers:
|
||||||
swift-storage-region1-zone1-offer:
|
swift-storage-region1-zone1:
|
||||||
endpoints:
|
endpoints:
|
||||||
- swift-storage
|
- swift-storage
|
||||||
swift-storage-region1-zone2:
|
swift-storage-region1-zone2:
|
||||||
offers:
|
offers:
|
||||||
swift-storage-region1-zone2-offer:
|
swift-storage-region1-zone2:
|
||||||
endpoints:
|
endpoints:
|
||||||
- swift-storage
|
- swift-storage
|
||||||
swift-storage-region1-zone3:
|
swift-storage-region1-zone3:
|
||||||
offers:
|
offers:
|
||||||
swift-storage-region1-zone3-offer:
|
swift-storage-region1-zone3:
|
||||||
endpoints:
|
endpoints:
|
||||||
- swift-storage
|
- swift-storage
|
||||||
|
|
|
@ -20,12 +20,12 @@ relations:
|
||||||
- swift-proxy-region1:rings-distributor
|
- swift-proxy-region1:rings-distributor
|
||||||
saas:
|
saas:
|
||||||
keystone:
|
keystone:
|
||||||
url: admin/{{ swift_gr_region1 }}.keystone-offer
|
url: admin/{{ swift_gr_region1 }}.keystone
|
||||||
swift-proxy-region1:
|
swift-proxy-region1:
|
||||||
url: admin/{{ swift_gr_region1 }}.swift-proxy-region1-offer
|
url: admin/{{ swift_gr_region1 }}.swift-proxy-region1
|
||||||
swift-storage-region1-zone1:
|
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:
|
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:
|
swift-storage-region1-zone3:
|
||||||
url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone3-offer
|
url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone3
|
||||||
|
|
|
@ -9,14 +9,11 @@ gate_bundles:
|
||||||
- xenial-ocata
|
- xenial-ocata
|
||||||
- xenial-mitaka
|
- xenial-mitaka
|
||||||
- trusty-mitaka
|
- trusty-mitaka
|
||||||
- disco-stein
|
|
||||||
- bionic-train-gr:
|
- bionic-train-gr:
|
||||||
- swift_gr_region1: bionic-train-gr-r1
|
- swift_gr_region1: bionic-train-gr-r1
|
||||||
- swift_gr_region2: bionic-train-gr-r2
|
- swift_gr_region2: bionic-train-gr-r2
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- bionic-train
|
- bionic-train
|
||||||
dev_bundles:
|
|
||||||
- disco-stein
|
|
||||||
configure:
|
configure:
|
||||||
- swift_gr_region1:
|
- swift_gr_region1:
|
||||||
- zaza.openstack.charm_tests.swift.setup.wait_for_region2
|
- zaza.openstack.charm_tests.swift.setup.wait_for_region2
|
||||||
|
|
Loading…
Reference in New Issue