1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
Description: Do not set store_description twice
If using multistore, puppet-glance is attempting to define twice
glance_store/store_description, which obviously fails.
Author: Thomas Goirand <zigo@debian.org>
Forwarded: no
Last-Update: 2020-10-18
Index: puppet-module-glance/manifests/backend/multistore/cinder.pp
===================================================================
--- puppet-module-glance.orig/manifests/backend/multistore/cinder.pp
+++ puppet-module-glance/manifests/backend/multistore/cinder.pp
@@ -169,6 +169,7 @@ define glance::backend::multistore::cind
"${name}/cinder_use_multipath": value => $cinder_use_multipath;
"${name}/cinder_mount_point_base": value => $cinder_mount_point_base;
"${name}/cinder_do_extend_attached": value => $cinder_do_extend_attached;
+ "${name}/store_description": value => $store_description;
"${name}/weight": value => $weight;
}
}
Index: puppet-module-glance/manifests/backend/multistore/rbd.pp
===================================================================
--- puppet-module-glance.orig/manifests/backend/multistore/rbd.pp
+++ puppet-module-glance/manifests/backend/multistore/rbd.pp
@@ -82,7 +82,6 @@ define glance::backend::multistore::rbd(
"${name}/rbd_store_chunk_size": value => $rbd_store_chunk_size;
"${name}/rbd_thin_provisioning": value => $rbd_thin_provisioning;
"${name}/rados_connect_timeout": value => $rados_connect_timeout;
- "${name}/store_description": value => $store_description;
"${name}/weight": value => $weight;
}
Index: puppet-module-glance/manifests/backend/multistore/swift.pp
===================================================================
--- puppet-module-glance.orig/manifests/backend/multistore/swift.pp
+++ puppet-module-glance/manifests/backend/multistore/swift.pp
@@ -151,7 +151,6 @@ define glance::backend::multistore::swif
"${name}/swift_buffer_on_upload": value => $swift_buffer_on_upload;
"${name}/swift_upload_buffer_dir": value => $swift_upload_buffer_dir;
"${name}/swift_store_retry_get_count": value => $swift_store_retry_get_count;
- "${name}/store_description": value => $store_description;
"${name}/weight": value => $weight;
}
glance_cache_config {
|
