Refresh Glance example configs for Victoria milestone 3

Change-Id: Ibd02882c1e42de3db7f78b50dd974b99b0d9ded1

3 files changed, 223 insertions, 23 deletions

diff --git a/etc/glance-api.conf b/etc/glance-api.conf
index c4b179876..f9904e612 100644
--- a/etc/glance-api.conf
+++ b/etc/glance-api.conf
@@ -1514,6 +1514,11 @@
 # Related options:
 #     * None
 #
+# NOTE: You cannot use an encrypted volume_type associated with an NFS backend.
+# An encrypted volume stored on an NFS backend will raise an exception whenever
+# glance_store tries to write or access image data stored in that volume.
+# Consult your Cinder administrator to determine an appropriate volume_type.
+#
 #  (string value)
 #cinder_volume_type = <None>
 
@@ -1770,11 +1775,14 @@
 #
 # Filesystem store metadata file.
 #
-# The path to a file which contains the metadata to be returned with
-# any location associated with the filesystem store. The file must
-# contain a valid JSON object. The object should contain the keys
-# ``id`` and ``mountpoint``. The value for both keys should be a
-# string.
+# The path to a file which contains the metadata to be returned with any
+# location
+# associated with the filesystem store. Once this option is set, it is used for
+# new images created afterward only - previously existing images are not
+# affected.
+#
+# The file must contain a valid JSON object. The object should contain the keys
+# ``id`` and ``mountpoint``. The value for both keys should be a string.
 #
 # Possible values:
 #     * A valid path to the store metadata file
@@ -1828,6 +1836,27 @@
 # Minimum value: 1
 #filesystem_store_chunk_size = 65536
 
+#
+# Enable or not thin provisioning in this backend.
+#
+# This configuration option enable the feature of not really write null byte
+# sequences on the filesystem, the holes who can appear will automatically
+# be interpreted by the filesystem as null bytes, and do not really consume
+# your storage.
+# Enabling this feature will also speed up image upload and save network trafic
+# in addition to save space in the backend, as null bytes sequences are not
+# sent over the network.
+#
+# Possible Values:
+#     * True
+#     * False
+#
+# Related options:
+#     * None
+#
+#  (boolean value)
+#filesystem_thin_provisioning = false
+
 
 [glance.store.http.store]
 
@@ -2009,6 +2038,26 @@
 #  (integer value)
 #rados_connect_timeout = 0
 
+#
+# Enable or not thin provisioning in this backend.
+#
+# This configuration option enable the feature of not really write null byte
+# sequences on the RBD backend, the holes who can appear will automatically
+# be interpreted by Ceph as null bytes, and do not really consume your storage.
+# Enabling this feature will also speed up image upload and save network trafic
+# in addition to save space in the backend, as null bytes sequences are not
+# sent over the network.
+#
+# Possible Values:
+#     * True
+#     * False
+#
+# Related options:
+#     * None
+#
+#  (boolean value)
+#rbd_thin_provisioning = false
+
 
 [glance.store.s3.store]
 
@@ -3305,6 +3354,11 @@
 # Related options:
 #     * None
 #
+# NOTE: You cannot use an encrypted volume_type associated with an NFS backend.
+# An encrypted volume stored on an NFS backend will raise an exception whenever
+# glance_store tries to write or access image data stored in that volume.
+# Consult your Cinder administrator to determine an appropriate volume_type.
+#
 #  (string value)
 #cinder_volume_type = <None>
 
@@ -3411,11 +3465,14 @@
 #
 # Filesystem store metadata file.
 #
-# The path to a file which contains the metadata to be returned with
-# any location associated with the filesystem store. The file must
-# contain a valid JSON object. The object should contain the keys
-# ``id`` and ``mountpoint``. The value for both keys should be a
-# string.
+# The path to a file which contains the metadata to be returned with any
+# location
+# associated with the filesystem store. Once this option is set, it is used for
+# new images created afterward only - previously existing images are not
+# affected.
+#
+# The file must contain a valid JSON object. The object should contain the keys
+# ``id`` and ``mountpoint``. The value for both keys should be a string.
 #
 # Possible values:
 #     * A valid path to the store metadata file
@@ -3470,6 +3527,27 @@
 #filesystem_store_chunk_size = 65536
 
 #
+# Enable or not thin provisioning in this backend.
+#
+# This configuration option enable the feature of not really write null byte
+# sequences on the filesystem, the holes who can appear will automatically
+# be interpreted by the filesystem as null bytes, and do not really consume
+# your storage.
+# Enabling this feature will also speed up image upload and save network trafic
+# in addition to save space in the backend, as null bytes sequences are not
+# sent over the network.
+#
+# Possible Values:
+#     * True
+#     * False
+#
+# Related options:
+#     * None
+#
+#  (boolean value)
+#filesystem_thin_provisioning = false
+
+#
 # Path to the CA bundle file.
 #
 # This configuration option enables the operator to use a custom
@@ -3637,6 +3715,26 @@
 #rados_connect_timeout = 0
 
 #
+# Enable or not thin provisioning in this backend.
+#
+# This configuration option enable the feature of not really write null byte
+# sequences on the RBD backend, the holes who can appear will automatically
+# be interpreted by Ceph as null bytes, and do not really consume your storage.
+# Enabling this feature will also speed up image upload and save network trafic
+# in addition to save space in the backend, as null bytes sequences are not
+# sent over the network.
+#
+# Possible Values:
+#     * True
+#     * False
+#
+# Related options:
+#     * None
+#
+#  (boolean value)
+#rbd_thin_provisioning = false
+
+#
 # The host where the S3 server is listening.
 #
 # This configuration option sets the host of the S3 or S3 compatible storage
@@ -4591,8 +4689,8 @@
 #auth_version = <None>
 
 # Interface to use for the Identity API endpoint. Valid values are "public",
-# "internal" or "admin"(default). (string value)
-#interface = admin
+# "internal" (default) or "admin". (string value)
+#interface = internal
 
 # Do not handle authorization requests within the middleware, but delegate the
 # authorization decision to downstream WSGI components. (boolean value)
@@ -5139,6 +5237,10 @@
 # client queue does not exist. (integer value)
 #direct_mandatory_flag = True
 
+# Enable x-cancel-on-ha-failover flag so that rabbitmq server will cancel and
+# notify consumerswhen queue is down (boolean value)
+#enable_cancel_on_failover = false
+
 
 [oslo_middleware]
 
@@ -5607,4 +5709,4 @@
 # same interpreter running Glance itself. However, in some situations
 # (i.e. uwsgi) this may not actually point to a python interpreter
 # itself. (string value)
-#python_interpreter = /bin/python
+#python_interpreter = /opt/stack/glance/.tox/genconfig/bin/python
diff --git a/etc/glance-cache.conf b/etc/glance-cache.conf
index 668279ed1..6fde03916 100644
--- a/etc/glance-cache.conf
+++ b/etc/glance-cache.conf
@@ -1046,6 +1046,11 @@
 # Related options:
 #     * None
 #
+# NOTE: You cannot use an encrypted volume_type associated with an NFS backend.
+# An encrypted volume stored on an NFS backend will raise an exception whenever
+# glance_store tries to write or access image data stored in that volume.
+# Consult your Cinder administrator to determine an appropriate volume_type.
+#
 #  (string value)
 #cinder_volume_type = <None>
 
@@ -1152,11 +1157,14 @@
 #
 # Filesystem store metadata file.
 #
-# The path to a file which contains the metadata to be returned with
-# any location associated with the filesystem store. The file must
-# contain a valid JSON object. The object should contain the keys
-# ``id`` and ``mountpoint``. The value for both keys should be a
-# string.
+# The path to a file which contains the metadata to be returned with any
+# location
+# associated with the filesystem store. Once this option is set, it is used for
+# new images created afterward only - previously existing images are not
+# affected.
+#
+# The file must contain a valid JSON object. The object should contain the keys
+# ``id`` and ``mountpoint``. The value for both keys should be a string.
 #
 # Possible values:
 #     * A valid path to the store metadata file
@@ -1211,6 +1219,27 @@
 #filesystem_store_chunk_size = 65536
 
 #
+# Enable or not thin provisioning in this backend.
+#
+# This configuration option enable the feature of not really write null byte
+# sequences on the filesystem, the holes who can appear will automatically
+# be interpreted by the filesystem as null bytes, and do not really consume
+# your storage.
+# Enabling this feature will also speed up image upload and save network trafic
+# in addition to save space in the backend, as null bytes sequences are not
+# sent over the network.
+#
+# Possible Values:
+#     * True
+#     * False
+#
+# Related options:
+#     * None
+#
+#  (boolean value)
+#filesystem_thin_provisioning = false
+
+#
 # Path to the CA bundle file.
 #
 # This configuration option enables the operator to use a custom
@@ -1378,6 +1407,26 @@
 #rados_connect_timeout = 0
 
 #
+# Enable or not thin provisioning in this backend.
+#
+# This configuration option enable the feature of not really write null byte
+# sequences on the RBD backend, the holes who can appear will automatically
+# be interpreted by Ceph as null bytes, and do not really consume your storage.
+# Enabling this feature will also speed up image upload and save network trafic
+# in addition to save space in the backend, as null bytes sequences are not
+# sent over the network.
+#
+# Possible Values:
+#     * True
+#     * False
+#
+# Related options:
+#     * None
+#
+#  (boolean value)
+#rbd_thin_provisioning = false
+
+#
 # The host where the S3 server is listening.
 #
 # This configuration option sets the host of the S3 or S3 compatible storage
diff --git a/etc/glance-scrubber.conf b/etc/glance-scrubber.conf
index 0dd371395..72849e5ba 100644
--- a/etc/glance-scrubber.conf
+++ b/etc/glance-scrubber.conf
@@ -1155,6 +1155,11 @@
 # Related options:
 #     * None
 #
+# NOTE: You cannot use an encrypted volume_type associated with an NFS backend.
+# An encrypted volume stored on an NFS backend will raise an exception whenever
+# glance_store tries to write or access image data stored in that volume.
+# Consult your Cinder administrator to determine an appropriate volume_type.
+#
 #  (string value)
 #cinder_volume_type = <None>
 
@@ -1261,11 +1266,14 @@
 #
 # Filesystem store metadata file.
 #
-# The path to a file which contains the metadata to be returned with
-# any location associated with the filesystem store. The file must
-# contain a valid JSON object. The object should contain the keys
-# ``id`` and ``mountpoint``. The value for both keys should be a
-# string.
+# The path to a file which contains the metadata to be returned with any
+# location
+# associated with the filesystem store. Once this option is set, it is used for
+# new images created afterward only - previously existing images are not
+# affected.
+#
+# The file must contain a valid JSON object. The object should contain the keys
+# ``id`` and ``mountpoint``. The value for both keys should be a string.
 #
 # Possible values:
 #     * A valid path to the store metadata file
@@ -1320,6 +1328,27 @@
 #filesystem_store_chunk_size = 65536
 
 #
+# Enable or not thin provisioning in this backend.
+#
+# This configuration option enable the feature of not really write null byte
+# sequences on the filesystem, the holes who can appear will automatically
+# be interpreted by the filesystem as null bytes, and do not really consume
+# your storage.
+# Enabling this feature will also speed up image upload and save network trafic
+# in addition to save space in the backend, as null bytes sequences are not
+# sent over the network.
+#
+# Possible Values:
+#     * True
+#     * False
+#
+# Related options:
+#     * None
+#
+#  (boolean value)
+#filesystem_thin_provisioning = false
+
+#
 # Path to the CA bundle file.
 #
 # This configuration option enables the operator to use a custom
@@ -1487,6 +1516,26 @@
 #rados_connect_timeout = 0
 
 #
+# Enable or not thin provisioning in this backend.
+#
+# This configuration option enable the feature of not really write null byte
+# sequences on the RBD backend, the holes who can appear will automatically
+# be interpreted by Ceph as null bytes, and do not really consume your storage.
+# Enabling this feature will also speed up image upload and save network trafic
+# in addition to save space in the backend, as null bytes sequences are not
+# sent over the network.
+#
+# Possible Values:
+#     * True
+#     * False
+#
+# Related options:
+#     * None
+#
+#  (boolean value)
+#rbd_thin_provisioning = false
+
+#
 # The host where the S3 server is listening.
 #
 # This configuration option sets the host of the S3 or S3 compatible storage