--- a/components/openstack/glance/files/glance-cache.conf	Fri Mar 20 03:13:26 2015 -0700
+++ b/components/openstack/glance/files/glance-cache.conf	Thu Mar 19 14:41:20 2015 -0700
@@ -5,6 +5,11 @@
 # Show debugging output in logs (sets DEBUG log level output)
 #debug = False
 
+# Log to this file. Make sure you do not set the same log file for both the API
+# and registry servers!
+#
+# If `log_file` is omitted and `use_syslog` is false, then log messages are
+# sent to stdout as a fallback.
 log_file = /var/log/glance/image-cache.log
 
 # Send logs to syslog (/dev/log) instead of to file specified by `log_file`
@@ -17,16 +22,6 @@
 # stalled and eligible for reaping
 image_cache_stall_time = 86400
 
-# image_cache_invalid_entry_grace_period - seconds
-#
-# If an exception is raised as we're writing to the cache, the cache-entry is
-# deemed invalid and moved to <image_cache_datadir>/invalid so that it can be
-# inspected for debugging purposes.
-#
-# This is number of seconds to leave these invalid images around before they
-# are elibible to be reaped.
-image_cache_invalid_entry_grace_period = 3600
-
 # Max cache size in bytes
 image_cache_max_size = 10737418240
 
@@ -51,6 +46,7 @@
 #                glance.store.swift.Store,
 #                glance.store.sheepdog.Store,
 #                glance.store.cinder.Store,
+#                glance.store.vmware_datastore.Store,
 
 # ============ Filesystem Store Options ========================
 
@@ -160,6 +156,42 @@
 # Allow to perform insecure SSL requests to cinder (boolean value)
 #cinder_api_insecure = False
 
+# ============ VMware Datastore Store Options =====================
+
+# ESX/ESXi or vCenter Server target system.
+# The server value can be an IP address or a DNS name
+# e.g. 127.0.0.1, 127.0.0.1:443, www.vmware-infra.com
+#vmware_server_host = <None>
+
+# Server username (string value)
+#vmware_server_username = <None>
+
+# Server password (string value)
+#vmware_server_password = <None>
+
+# Inventory path to a datacenter (string value)
+# Value optional when vmware_server_ip is an ESX/ESXi host: if specified
+# should be `ha-datacenter`.
+#vmware_datacenter_path = <None>
+
+# Datastore associated with the datacenter (string value)
+#vmware_datastore_name = <None>
+
+# The number of times we retry on failures
+# e.g., socket error, etc (integer value)
+#vmware_api_retry_count = 10
+
+# The interval used for polling remote tasks
+# invoked on VMware ESX/VC server in seconds (integer value)
+#vmware_task_poll_interval = 5
+
+# Absolute path of the folder containing the images in the datastore
+# (string value)
+#vmware_store_image_dir = /openstack_glance
+
+# Allow to perform insecure SSL requests to the target system (boolean value)
+#vmware_api_insecure = False
+
 # ================= Security Options ==========================
 
 # AES key for encrypting store 'location' metadata, including