Skip to content

Commit 5d38dbd

Browse files
committed
Refresh Glance example configs for zed milestone 3
Change-Id: I5febc9f4094f88caab3ed18026a8cb7b6a345d45
1 parent 51e4fb1 commit 5d38dbd

File tree

4 files changed

+84
-14
lines changed

4 files changed

+84
-14
lines changed

etc/glance-api.conf

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,7 @@
481481
# List of enabled Image Import Methods
482482
#
483483
# 'glance-direct', 'copy-image' and 'web-download' are enabled by default.
484+
# 'glance-download' is available, but requires federated deployments.
484485
#
485486
# Related options:
486487
# * [DEFAULT]/node_staging_uri (list value)
@@ -798,20 +799,6 @@
798799
# backends should be separated using comma. (dict value)
799800
#enabled_backends = <None>
800801

801-
#
802-
# The interval in seconds to run periodic job cache_images.
803-
#
804-
# The cache_images method will fetch all images which are in queued state
805-
# for caching in cache directory. The default value is 300.
806-
#
807-
# Possible values:
808-
# * Positive integer
809-
#
810-
# Related options:
811-
# * None
812-
# (floating point value)
813-
#cache_prefetcher_interval = 300
814-
815802
# This argument is used internally on Windows. Glance passes a pipe handle to
816803
# child processes, which is then used for inter-process communication. (string
817804
# value)
@@ -5120,6 +5107,19 @@
51205107
#auth_section = <None>
51215108

51225109

5110+
[os_brick]
5111+
5112+
#
5113+
# From os_brick
5114+
#
5115+
5116+
# Directory to use for os-brick lock files. Defaults to
5117+
# oslo_concurrency.lock_path which is a sensible default for compute nodes, but
5118+
# not for HCI deployments or controllers where Glance uses Cinder as a backend,
5119+
# as locks should use the same directory. (string value)
5120+
#lock_path = <None>
5121+
5122+
51235123
[oslo_concurrency]
51245124

51255125
#
@@ -5679,6 +5679,26 @@
56795679
# this option enabled. (boolean value)
56805680
#rabbit_quorum_queue = false
56815681

5682+
# Each time a message is redelivered to a consumer, a counter is incremented.
5683+
# Once the redelivery count exceeds the delivery limit the message gets dropped
5684+
# or dead-lettered (if a DLX exchange has been configured) Used only when
5685+
# rabbit_quorum_queue is enabled, Default 0 which means dont set a limit.
5686+
# (integer value)
5687+
#rabbit_quorum_delivery_limit = 0
5688+
5689+
# By default all messages are maintained in memory if a quorum queue grows in
5690+
# length it can put memory pressure on a cluster. This option can limit the
5691+
# number of messages in the quorum queue. Used only when rabbit_quorum_queue is
5692+
# enabled, Default 0 which means dont set a limit. (integer value)
5693+
#rabbit_quroum_max_memory_length = 0
5694+
5695+
# By default all messages are maintained in memory if a quorum queue grows in
5696+
# length it can put memory pressure on a cluster. This option can limit the
5697+
# number of memory bytes used by the quorum queue. Used only when
5698+
# rabbit_quorum_queue is enabled, Default 0 which means dont set a limit.
5699+
# (integer value)
5700+
#rabbit_quroum_max_memory_bytes = 0
5701+
56825702
# Positive integer representing duration in seconds for queue TTL (x-expires).
56835703
# Queues which are unused for the duration of the TTL are automatically deleted.
56845704
# The parameter affects only reply and fanout queues. (integer value)

etc/glance-cache.conf

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,7 @@
423423
# List of enabled Image Import Methods
424424
#
425425
# 'glance-direct', 'copy-image' and 'web-download' are enabled by default.
426+
# 'glance-download' is available, but requires federated deployments.
426427
#
427428
# Related options:
428429
# * [DEFAULT]/node_staging_uri (list value)
@@ -2442,6 +2443,19 @@
24422443
#vmware_datastores =
24432444

24442445

2446+
[os_brick]
2447+
2448+
#
2449+
# From os_brick
2450+
#
2451+
2452+
# Directory to use for os-brick lock files. Defaults to
2453+
# oslo_concurrency.lock_path which is a sensible default for compute nodes, but
2454+
# not for HCI deployments or controllers where Glance uses Cinder as a backend,
2455+
# as locks should use the same directory. (string value)
2456+
#lock_path = <None>
2457+
2458+
24452459
[oslo_policy]
24462460

24472461
#

etc/glance-image-import.conf.sample

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,28 @@
11
[DEFAULT]
22

33

4+
[glance_download_opts]
5+
6+
#
7+
# From glance
8+
#
9+
10+
#
11+
# Specify metadata prefix to be set on the target image when using
12+
# glance-download. All other properties coming from the source image won't be
13+
# set
14+
# on the target image. If specified metadata does not exist on the source image
15+
# it won't be set on the target image. Note you can't set the os_glance prefix
16+
# as it is reserved by glance, so the related properties won't be set on the
17+
# target image.
18+
#
19+
# Possible values:
20+
# * List containing extra_properties prefixes: ['os_', 'architecture']
21+
#
22+
# (list value)
23+
#extra_properties = [hw_,trait:,os_distro,os_secure_boot,os_type]
24+
25+
426
[image_conversion]
527

628
#

etc/glance-scrubber.conf

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,7 @@
423423
# List of enabled Image Import Methods
424424
#
425425
# 'glance-direct', 'copy-image' and 'web-download' are enabled by default.
426+
# 'glance-download' is available, but requires federated deployments.
426427
#
427428
# Related options:
428429
# * [DEFAULT]/node_staging_uri (list value)
@@ -2535,6 +2536,19 @@
25352536
#vmware_datastores =
25362537

25372538

2539+
[os_brick]
2540+
2541+
#
2542+
# From os_brick
2543+
#
2544+
2545+
# Directory to use for os-brick lock files. Defaults to
2546+
# oslo_concurrency.lock_path which is a sensible default for compute nodes, but
2547+
# not for HCI deployments or controllers where Glance uses Cinder as a backend,
2548+
# as locks should use the same directory. (string value)
2549+
#lock_path = <None>
2550+
2551+
25382552
[oslo_concurrency]
25392553

25402554
#

0 commit comments

Comments
 (0)