Merge "Refresh Glance example configs for bobcat milestone 1"27.0.0.0b1

3 files changed, 84 insertions, 4 deletions

diff --git a/etc/glance-api.conf b/etc/glance-api.conf
index 0af0dc94b..a752a3dba 100644
--- a/etc/glance-api.conf
+++ b/etc/glance-api.conf
@@ -1685,6 +1685,19 @@
 #  (string value)
 #cinder_mount_point_base = /var/lib/glance/mnt
 
+#
+# If this is set to True, glance will perform an extend operation
+# on the attached volume. Only enable this option if the cinder
+# backend driver supports the functionality of extending online
+# (in-use) volumes. Supported from cinder microversion 3.42 and
+# onwards. By default, it is set to False.
+#
+# Possible values:
+#     * True or False
+#
+#  (boolean value)
+#cinder_do_extend_attached = false
+
 
 [cors]
 
@@ -2138,7 +2151,7 @@
 #  (string value)
 #rbd_store_ceph_conf =
 
-#
+# DEPRECATED:
 # Timeout value for connecting to Ceph cluster.
 #
 # This configuration option takes in the timeout value in seconds used
@@ -2155,6 +2168,13 @@
 #     * None
 #
 #  (integer value)
+# This option is deprecated for removal since Zed.
+# Its value may be silently ignored in the future.
+# Reason:
+# This option has not had any effect in years. Users willing to set a timeout
+# for
+# connecting to the Ceph cluster should use 'client_mount_timeout' in Ceph's
+# configuration file.
 #rados_connect_timeout = 0
 
 #
@@ -3583,6 +3603,19 @@
 #cinder_mount_point_base = /var/lib/glance/mnt
 
 #
+# If this is set to True, glance will perform an extend operation
+# on the attached volume. Only enable this option if the cinder
+# backend driver supports the functionality of extending online
+# (in-use) volumes. Supported from cinder microversion 3.42 and
+# onwards. By default, it is set to False.
+#
+# Possible values:
+#     * True or False
+#
+#  (boolean value)
+#cinder_do_extend_attached = false
+
+#
 # Directory to which the filesystem backend store writes images.
 #
 # Upon start up, Glance creates the directory if it doesn't already
@@ -3878,7 +3911,7 @@
 #  (string value)
 #rbd_store_ceph_conf =
 
-#
+# DEPRECATED:
 # Timeout value for connecting to Ceph cluster.
 #
 # This configuration option takes in the timeout value in seconds used
@@ -3895,6 +3928,13 @@
 #     * None
 #
 #  (integer value)
+# This option is deprecated for removal since Zed.
+# Its value may be silently ignored in the future.
+# Reason:
+# This option has not had any effect in years. Users willing to set a timeout
+# for
+# connecting to the Ceph cluster should use 'client_mount_timeout' in Ceph's
+# configuration file.
 #rados_connect_timeout = 0
 
 #
diff --git a/etc/glance-cache.conf b/etc/glance-cache.conf
index 62c90638d..765efde7f 100644
--- a/etc/glance-cache.conf
+++ b/etc/glance-cache.conf
@@ -1178,6 +1178,19 @@
 #cinder_mount_point_base = /var/lib/glance/mnt
 
 #
+# If this is set to True, glance will perform an extend operation
+# on the attached volume. Only enable this option if the cinder
+# backend driver supports the functionality of extending online
+# (in-use) volumes. Supported from cinder microversion 3.42 and
+# onwards. By default, it is set to False.
+#
+# Possible values:
+#     * True or False
+#
+#  (boolean value)
+#cinder_do_extend_attached = false
+
+#
 # Directory to which the filesystem backend store writes images.
 #
 # Upon start up, Glance creates the directory if it doesn't already
@@ -1473,7 +1486,7 @@
 #  (string value)
 #rbd_store_ceph_conf =
 
-#
+# DEPRECATED:
 # Timeout value for connecting to Ceph cluster.
 #
 # This configuration option takes in the timeout value in seconds used
@@ -1490,6 +1503,13 @@
 #     * None
 #
 #  (integer value)
+# This option is deprecated for removal since Zed.
+# Its value may be silently ignored in the future.
+# Reason:
+# This option has not had any effect in years. Users willing to set a timeout
+# for
+# connecting to the Ceph cluster should use 'client_mount_timeout' in Ceph's
+# configuration file.
 #rados_connect_timeout = 0
 
 #
diff --git a/etc/glance-scrubber.conf b/etc/glance-scrubber.conf
index b2d80567f..9ea18511c 100644
--- a/etc/glance-scrubber.conf
+++ b/etc/glance-scrubber.conf
@@ -1280,6 +1280,19 @@
 #cinder_mount_point_base = /var/lib/glance/mnt
 
 #
+# If this is set to True, glance will perform an extend operation
+# on the attached volume. Only enable this option if the cinder
+# backend driver supports the functionality of extending online
+# (in-use) volumes. Supported from cinder microversion 3.42 and
+# onwards. By default, it is set to False.
+#
+# Possible values:
+#     * True or False
+#
+#  (boolean value)
+#cinder_do_extend_attached = false
+
+#
 # Directory to which the filesystem backend store writes images.
 #
 # Upon start up, Glance creates the directory if it doesn't already
@@ -1575,7 +1588,7 @@
 #  (string value)
 #rbd_store_ceph_conf =
 
-#
+# DEPRECATED:
 # Timeout value for connecting to Ceph cluster.
 #
 # This configuration option takes in the timeout value in seconds used
@@ -1592,6 +1605,13 @@
 #     * None
 #
 #  (integer value)
+# This option is deprecated for removal since Zed.
+# Its value may be silently ignored in the future.
+# Reason:
+# This option has not had any effect in years. Users willing to set a timeout
+# for
+# connecting to the Ceph cluster should use 'client_mount_timeout' in Ceph's
+# configuration file.
 #rados_connect_timeout = 0
 
 #