From e0ed80527facf7285ebb496157abe9dbf2b524f0 Mon Sep 17 00:00:00 2001
From: Chris MacNaughton <chris.macnaughton@canonical.com>
Date: Wed, 6 Oct 2021 08:23:35 +0200
Subject: [PATCH] Disable local overlay for the CMR bundles.

Closes-Bug: #1945786
Change-Id: I93ab6d1c19e34fd5001de1dcde978f74793f74ae
---
 tests/bundles/bionic-train-gr-r1.yaml | 7 ++++---
 tests/bundles/bionic-train-gr-r2.yaml | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/tests/bundles/bionic-train-gr-r1.yaml b/tests/bundles/bionic-train-gr-r1.yaml
index dd4d68f..544ff54 100644
--- a/tests/bundles/bionic-train-gr-r1.yaml
+++ b/tests/bundles/bionic-train-gr-r1.yaml
@@ -1,4 +1,5 @@
 series: bionic
+local_overlay_enabled: false
 applications:
   swift-proxy-region1:
     charm: cs:~openstack-charmers-next/swift-proxy
@@ -14,7 +15,7 @@ applications:
       write-affinity-node-count: '1'
       openstack-origin: cloud:bionic-train
   swift-storage-region1-zone1:
-    charm: swift-storage
+    charm: ../../.
     num_units: 1
     options:
       storage-region: 1
@@ -22,7 +23,7 @@ applications:
       block-device: /etc/swift/storage.img|2G
       openstack-origin: cloud:bionic-train
   swift-storage-region1-zone2:
-    charm: swift-storage
+    charm: ../../.
     num_units: 1
     options:
       storage-region: 1
@@ -30,7 +31,7 @@ applications:
       block-device: /etc/swift/storage.img|2G
       openstack-origin: cloud:bionic-train
   swift-storage-region1-zone3:
-    charm: swift-storage
+    charm: ../../.
     num_units: 1
     options:
       storage-region: 1
diff --git a/tests/bundles/bionic-train-gr-r2.yaml b/tests/bundles/bionic-train-gr-r2.yaml
index 9f36d2f..f924974 100644
--- a/tests/bundles/bionic-train-gr-r2.yaml
+++ b/tests/bundles/bionic-train-gr-r2.yaml
@@ -1,4 +1,5 @@
 series: bionic
+local_overlay_enabled: false
 applications:
   swift-proxy-region2:
     charm: cs:~openstack-charmers-next/swift-proxy
@@ -14,7 +15,7 @@ applications:
       write-affinity-node-count: '1'
       openstack-origin: cloud:bionic-train
   swift-storage-region2-zone1:
-    charm: swift-storage
+    charm: ../../.
     num_units: 1
     options:
       storage-region: 2
@@ -22,7 +23,7 @@ applications:
       block-device: /etc/swift/storage.img|2G
       openstack-origin: cloud:bionic-train
   swift-storage-region2-zone2:
-    charm: swift-storage
+    charm: ../../.
     num_units: 1
     options:
       storage-region: 2
@@ -30,7 +31,7 @@ applications:
       block-device: /etc/swift/storage.img|2G
       openstack-origin: cloud:bionic-train
   swift-storage-region2-zone3:
-    charm: swift-storage
+    charm: ../../.
     num_units: 1
     options:
       storage-region: 2