summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-05-20 15:43:25 (GMT)
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-05-21 15:30:22 (GMT)
commit2fddf3914b0f46988bbeb6258b6ace13a2e32134 (patch)
tree4adab928a05f248ead8addbdec3dfb634e94aee3
parente977000db8d248ff2a03e9e2d032fa698d6469e0 (diff)
downloaddefinitions-2fddf3914b0f46988bbeb6258b6ace13a2e32134.tar.gz
Openstack: Update glance-registry.conf to its Kilo version
Change-Id: I69b64aa52ca85a79b61103ac98a670fcdc622375
-rw-r--r--openstack/usr/share/openstack/glance/glance-registry.conf65
1 files changed, 44 insertions, 21 deletions
diff --git a/openstack/usr/share/openstack/glance/glance-registry.conf b/openstack/usr/share/openstack/glance/glance-registry.conf
index 302f413..40993d8 100644
--- a/openstack/usr/share/openstack/glance/glance-registry.conf
+++ b/openstack/usr/share/openstack/glance/glance-registry.conf
@@ -49,15 +49,18 @@ limit_param_default = 25
# Role used to identify an authenticated user as administrator
#admin_role = admin
-# Whether to automatically create the database tables.
-# Default: False
-#db_auto_create = False
-
# Enable DEBUG log messages from sqlalchemy which prints every database
# query and response.
# Default: False
#sqlalchemy_debug = True
+# http_keepalive option. If False, server will return the header
+# "Connection: close", If True, server will return "Connection: Keep-Alive"
+# in its responses. In order to close the client socket connection
+# explicitly after the response is sent and read successfully by the client,
+# you simply have to set this option to False when you create a wsgi server.
+#http_keepalive = True
+
# ================= Syslog Options ============================
# Send logs to syslog (/dev/log) instead of to file specified
@@ -88,9 +91,10 @@ notification_driver = messagingv2
# default_publisher_id = image.localhost
# Messaging driver used for 'messaging' notifications driver
-rpc_backend=rabbit
+rpc_backend = 'rabbit'
-# Configuration options if sending notifications via rabbitmq
+# Configuration options if sending notifications via rabbitmq (these are
+# the defaults)
rabbit_host = {{ RABBITMQ_HOST }}
rabbit_port = {{ RABBITMQ_PORT }}
rabbit_use_ssl = false
@@ -103,23 +107,42 @@ rabbit_durable_queues = False
# Configuration options if sending notifications via Qpid (these are
# the defaults)
-qpid_notification_exchange = glance
-qpid_notification_topic = notifications
-qpid_hostname = localhost
-qpid_port = 5672
-qpid_username =
-qpid_password =
-qpid_sasl_mechanisms =
-qpid_reconnect_timeout = 0
-qpid_reconnect_limit = 0
-qpid_reconnect_interval_min = 0
-qpid_reconnect_interval_max = 0
-qpid_reconnect_interval = 0
-qpid_heartbeat = 5
+#qpid_notification_exchange = glance
+#qpid_notification_topic = notifications
+#qpid_hostname = localhost
+#qpid_port = 5672
+#qpid_username =
+#qpid_password =
+#qpid_sasl_mechanisms =
+#qpid_reconnect_timeout = 0
+#qpid_reconnect_limit = 0
+#qpid_reconnect_interval_min = 0
+#qpid_reconnect_interval_max = 0
+#qpid_reconnect_interval = 0
+#qpid_heartbeat = 5
# Set to 'ssl' to enable SSL
-qpid_protocol = tcp
-qpid_tcp_nodelay = True
+#qpid_protocol = tcp
+#qpid_tcp_nodelay = True
+
+
+# =============== Policy Options ==============================
+
+[oslo_policy]
+# The JSON file that defines policies.
+# Deprecated group/name - [DEFAULT]/policy_file
+#policy_file = policy.json
+
+# Default rule. Enforced when a requested rule is not found.
+# Deprecated group/name - [DEFAULT]/policy_default_rule
+#policy_default_rule = default
+# Directories where policy configuration files are stored.
+# They can be relative to any directory in the search path
+# defined by the config_dir option, or absolute paths.
+# The file defined by policy_file must exist for these
+# directories to be searched.
+# Deprecated group/name - [DEFAULT]/policy_dirs
+#policy_dirs = policy.d
# ================= Database Options ==========================