From cac0f79f71e5bee1972e6b4ab2adb161c493d3ec Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Tue, 30 Jul 2024 02:40:17 +0900
Subject: [PATCH] Fix incomplete setting to enable in-storage image data copy

Change-Id: Ie2e89ad697120aa46a05753690c5c3835e612f68
---
 fixtures/scenario001.pp |  3 ++-
 fixtures/scenario004.pp |  3 ++-
 fixtures/scenario005.pp |  3 ++-
 manifests/cinder.pp     |  4 +++-
 manifests/glance.pp     | 18 ++++++++++++------
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp
index 73aa38a94..c9095dad3 100644
--- a/fixtures/scenario001.pp
+++ b/fixtures/scenario001.pp
@@ -59,7 +59,8 @@ class { 'openstack_integration::keystone':
   token_expiration => '2400',
 }
 class { 'openstack_integration::glance':
-  backend => 'rbd',
+  backend                 => 'rbd',
+  show_multiple_locations => true,
 }
 class { 'openstack_integration::neutron':
   notification_topics => $notification_topics,
diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp
index 1f75f7a5b..2d4d00d4f 100644
--- a/fixtures/scenario004.pp
+++ b/fixtures/scenario004.pp
@@ -56,7 +56,8 @@ include openstack_integration::mysql
 include openstack_integration::redis
 include openstack_integration::keystone
 class { 'openstack_integration::glance':
-  backend => 'rbd',
+  backend                 => 'rbd',
+  show_multiple_locations => true,
 }
 
 class { 'openstack_integration::neutron':
diff --git a/fixtures/scenario005.pp b/fixtures/scenario005.pp
index 3089dd6d5..380fe0c6e 100644
--- a/fixtures/scenario005.pp
+++ b/fixtures/scenario005.pp
@@ -53,7 +53,8 @@ include openstack_integration::ovn
 include openstack_integration::keystone
 include openstack_integration::cinder
 class { 'openstack_integration::glance':
-  backend => 'cinder',
+  backend                 => 'cinder',
+  show_multiple_locations => true,
 }
 class { 'openstack_integration::neutron':
   driver                     => 'ovn',
diff --git a/manifests/cinder.pp b/manifests/cinder.pp
index 74b9747f7..6db9f16f4 100644
--- a/manifests/cinder.pp
+++ b/manifests/cinder.pp
@@ -139,7 +139,9 @@ class openstack_integration::cinder (
   }
   class { 'cinder::backup': }
   class { 'cinder::cron::db_purge': }
-  class { 'cinder::glance': }
+  class { 'cinder::glance':
+    allowed_direct_url_schemes => ['cinder'],
+  }
   case $backend {
     'iscsi': {
       class { 'cinder::setup_test_volume':
diff --git a/manifests/glance.pp b/manifests/glance.pp
index 174440d5a..35fca9580 100644
--- a/manifests/glance.pp
+++ b/manifests/glance.pp
@@ -9,9 +9,14 @@
 #   (optional) Boolean to configure or not image encryption
 #   Defaults to false.
 #
+# [*show_multiple_locations*]
+#   (optional) Include the backend image locations in image properties
+#   Defaults to undef
+#
 class openstack_integration::glance (
-  $backend          = 'file',
-  $image_encryption = false,
+  $backend                 = 'file',
+  $image_encryption        = false,
+  $show_multiple_locations = undef,
 ) {
 
   include openstack_integration::config
@@ -109,10 +114,11 @@ class openstack_integration::glance (
     }),
   }
   class { 'glance::api':
-    enabled_backends => $enabled_backends,
-    default_backend  => $default_backend,
-    bind_host        => $::openstack_integration::config::host,
-    service_name     => 'httpd',
+    enabled_backends        => $enabled_backends,
+    default_backend         => $default_backend,
+    bind_host               => $::openstack_integration::config::host,
+    service_name            => 'httpd',
+    show_multiple_locations => $show_multiple_locations,
   }
   class { 'glance::wsgi::apache':
     bind_host => $::openstack_integration::config::host,