From b8cc274f9a641f0a6df905358e96d5033e493f84 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Wed, 29 Jan 2020 10:04:27 +0000
Subject: [PATCH] Workaround for Juju bug 1860992

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

Change-Id: Ia3019c9d8b905b80d5a44691607bb8a9ea20fe9d
---
 tests/bundles/overlays/bionic-train-gr-r1.yaml.j2 | 10 +++++-----
 tests/bundles/overlays/bionic-train-gr-r2.yaml.j2 | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/bundles/overlays/bionic-train-gr-r1.yaml.j2 b/tests/bundles/overlays/bionic-train-gr-r1.yaml.j2
index 874dd37..f6abe8b 100644
--- a/tests/bundles/overlays/bionic-train-gr-r1.yaml.j2
+++ b/tests/bundles/overlays/bionic-train-gr-r1.yaml.j2
@@ -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
diff --git a/tests/bundles/overlays/bionic-train-gr-r2.yaml.j2 b/tests/bundles/overlays/bionic-train-gr-r2.yaml.j2
index f2e5c33..41837d8 100644
--- a/tests/bundles/overlays/bionic-train-gr-r2.yaml.j2
+++ b/tests/bundles/overlays/bionic-train-gr-r2.yaml.j2
@@ -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