--- a/components/openstack/glance/files/glance-api.conf Tue Jun 10 14:07:48 2014 -0700
+++ b/components/openstack/glance/files/glance-api.conf Wed Jun 11 17:13:12 2014 -0700
@@ -13,11 +13,14 @@
# List of which store classes and store class locations are
# currently known to glance at startup.
+# Existing but disabled stores:
+# glance.store.rbd.Store,
+# glance.store.s3.Store,
+# glance.store.swift.Store,
+# glance.store.sheepdog.Store,
+# glance.store.cinder.Store,
#known_stores = glance.store.filesystem.Store,
-# glance.store.http.Store,
-# glance.store.rbd.Store,
-# glance.store.s3.Store,
-# glance.store.swift.Store,
+# glance.store.http.Store
# Maximum image size (in bytes) that may be uploaded through the
@@ -43,6 +46,10 @@
# Not supported on OS X.
#tcp_keepidle = 600
+# API to use for accessing data. Default value points to sqlalchemy
+# package, it is also possible to use: glance.db.registry.api
+# data_api = glance.db.sqlalchemy.api
+
# SQLAlchemy connection string for the reference implementation
# registry server. Any valid SQLAlchemy connection string is fine.
# See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
@@ -84,6 +91,38 @@
# The default value is false.
#show_image_direct_url = False
+# Send headers containing user and tenant information when making requests to
+# the v1 glance registry. This allows the registry to function as if a user is
+# authenticated without the need to authenticate a user itself using the
+# auth_token middleware.
+# The default value is false.
+#send_identity_headers = False
+
+# Supported values for the 'container_format' image attribute
+#container_formats=ami,ari,aki,bare,ovf,uar
+
+# Supported values for the 'disk_format' image attribute
+#disk_formats=ami,ari,aki,vhd,vmdk,raw,qcow2,vdi,iso,zfs
+
+# Directory to use for lock files. Default to a temp directory
+# (string value). This setting needs to be the same for both
+# glance-scrubber and glance-api.
+#lock_path=<None>
+#
+# Property Protections config file
+# This file contains the rules for property protections and the roles
+# associated with it.
+# If this config value is not specified, by default, property protections
+# won't be enforced.
+# If a value is specified and the file is not found, then an
+# HTTPInternalServerError will be thrown.
+#property_protection_file =
+
+# Set a system wide quota for every user. This value is the total number
+# of bytes that a user can use across all storage systems. A value of
+# 0 means unlimited.
+#user_storage_quota = 0
+
# ================= Syslog Options ============================
# Send logs to syslog (/dev/log) instead of to file specified
@@ -153,6 +192,11 @@
# Default: False
#db_auto_create = False
+# Enable DEBUG log messages from sqlalchemy which prints every database
+# query and response.
+# Default: False
+#sqlalchemy_debug = True
+
# ============ Notification System Options =====================
# Notifications can be sent when images are create, updated or deleted.
@@ -177,7 +221,7 @@
# the defaults)
qpid_notification_exchange = glance
qpid_notification_topic = notifications
-qpid_host = localhost
+qpid_hostname = localhost
qpid_port = 5672
qpid_username =
qpid_password =
@@ -198,6 +242,12 @@
# writes image data to
filesystem_store_datadir = /var/lib/glance/images/
+# A path to a JSON file that contains metadata describing the storage
+# system. When show_multiple_locations is True the information in this
+# file will be returned with any location that is contained in this
+# store.
+#filesystem_store_metadata_file = None
+
# ============ Swift Store Options =============================
# Version of the authentication service to use
@@ -266,6 +316,12 @@
# is only necessary if the tenant has multiple swift endpoints.
#swift_store_region =
+# If set to False, disables SSL layer compression of https swift requests.
+# Setting to 'False' may improve performance for images which are already
+# in a compressed format, eg qcow2. If set to True, enables SSL layer
+# compression (provided it is supported by the target swift proxy).
+#swift_store_ssl_compression = True
+
# ============ S3 Store Options =============================
# Address where the S3 authentication service lives
@@ -320,6 +376,40 @@
# For best performance, this should be a power of two
rbd_store_chunk_size = 8
+# ============ Sheepdog Store Options =============================
+
+sheepdog_store_address = localhost
+
+sheepdog_store_port = 7000
+
+# Images will be chunked into objects of this size (in megabytes).
+# For best performance, this should be a power of two
+sheepdog_store_chunk_size = 64
+
+# ============ Cinder Store Options ===============================
+
+# Info to match when looking for cinder in the service catalog
+# Format is : separated values of the form:
+# <service_type>:<service_name>:<endpoint_type> (string value)
+#cinder_catalog_info = volume:cinder:publicURL
+
+# Override service catalog lookup with template for cinder endpoint
+# e.g. http://localhost:8776/v1/%(project_id)s (string value)
+#cinder_endpoint_template = <None>
+
+# Region name of this node (string value)
+#os_region_name = <None>
+
+# Location of ca certicates file to use for cinder client requests
+# (string value)
+#cinder_ca_certificates_file = <None>
+
+# Number of cinderclient retries on failed http calls (integer value)
+#cinder_http_retries = 3
+
+# Allow to perform insecure SSL requests to cinder (boolean value)
+#cinder_api_insecure = False
+
# ============ Delayed Delete Options =============================
# Turn on/off delayed delete
@@ -338,12 +428,12 @@
image_cache_dir = /var/lib/glance/image-cache/
[keystone_authtoken]
-auth_host = 127.0.0.1
-auth_port = 35357
-auth_protocol = http
+auth_uri = http://127.0.0.1:5000/v2.0
+identity_uri = http://127.0.0.1:35357
admin_tenant_name = %SERVICE_TENANT_NAME%
admin_user = %SERVICE_USER%
admin_password = %SERVICE_PASSWORD%
+signing_dir = /var/lib/glance/keystone-signing
[paste_deploy]
# Name of the paste configuration file that defines the available pipelines
@@ -353,4 +443,4 @@
# service name removed. For example, if your paste section name is
# [pipeline:glance-api-keystone], you would configure the flavor below
# as 'keystone'.
-#flavor=
+flavor = keystone