Fix incomplete setting to enable in-storage image data copy

Code Issues Proposed changes

Change-Id: Ie2e89ad697120aa46a05753690c5c3835e612f68

This commit is contained in:

Takashi Kajinami

2024年07月30日 02:40:17 +09:00

parent 6d37684f6d

commit cac0f79f71

5 changed files with 21 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

3
fixtures/scenario001.pp

View File

@@ -59,7 +59,8 @@ class { 'openstack_integration::keystone':

token_expiration => '2400',

}

class{ 'openstack_integration::glance':

backend => 'rbd',

show_multiple_locations => true,

}

class{ 'openstack_integration::neutron':

notification_topics => $notification_topics,

3
fixtures/scenario004.pp

View File

@@ -56,7 +56,8 @@ include openstack_integration::mysql

includeopenstack_integration::redis

includeopenstack_integration::keystone

class{ 'openstack_integration::glance':

backend => 'rbd',

show_multiple_locations => true,

}

class{ 'openstack_integration::neutron':

3
fixtures/scenario005.pp

View File

@@ -53,7 +53,8 @@ include openstack_integration::ovn

includeopenstack_integration::keystone

includeopenstack_integration::cinder

class{ 'openstack_integration::glance':

backend => 'cinder',

show_multiple_locations => true,

}

class{ 'openstack_integration::neutron':

driver => 'ovn',

4
manifests/cinder.pp

View File

@@ -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':

18
manifests/glance.pp

View File

@@ -9,9 +9,14 @@

#(optional)Booleantoconfigureornotimageencryption

#Defaultstofalse.

#

#[*show_multiple_locations*]

#(optional)Includethebackendimagelocationsinimageproperties

#Defaultstoundef

#

classopenstack_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,