summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-05-21 16:44:14 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-06-04 13:50:05 +0000
commite88df966295372ad390f04dd21459e95d4df6551 (patch)
tree53ab058aeb3079c4ac154dcdf232fcf6565c4b03
parent7159022f0d03778ea2d6803d9174e8539ea8a7a7 (diff)
downloaddefinitions-e88df966295372ad390f04dd21459e95d4df6551.tar.gz
Openstack: Add back the custom configuration for glance-registry
Add back the custom configuration for glance-registry adapted for the OpenStack Kilo release. Change-Id: I9e50a67f03581e5db5901af6ea6598d4ddeb6094
-rw-r--r--install-files/openstack/usr/share/openstack/glance/glance-registry.conf60
1 files changed, 31 insertions, 29 deletions
diff --git a/install-files/openstack/usr/share/openstack/glance/glance-registry.conf b/install-files/openstack/usr/share/openstack/glance/glance-registry.conf
index f7ce7956..40993d8d 100644
--- a/install-files/openstack/usr/share/openstack/glance/glance-registry.conf
+++ b/install-files/openstack/usr/share/openstack/glance/glance-registry.conf
@@ -6,7 +6,7 @@
#debug = False
# Address to bind the registry server
-bind_host = 0.0.0.0
+bind_host = {{ MANAGEMENT_INTERFACE_IP_ADDRESS }}
# Port the bind the registry server to
bind_port = 9191
@@ -16,7 +16,7 @@ bind_port = 9191
#
# 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/registry.log
+# log_file = /var/log/glance/registry.log
# Backlog requests when creating socket
backlog = 4096
@@ -65,7 +65,7 @@ limit_param_default = 25
# Send logs to syslog (/dev/log) instead of to file specified
# by `log_file`
-#use_syslog = False
+use_syslog = True
# Facility to use. If unset defaults to LOG_USER.
#syslog_log_facility = LOG_LOCAL1
@@ -85,21 +85,21 @@ limit_param_default = 25
# Driver or drivers to handle sending notifications. Set to
# 'messaging' to send notifications to a message queue.
-# notification_driver = noop
+notification_driver = messagingv2
# Default publisher_id for outgoing notifications.
# 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 (these are
# the defaults)
-rabbit_host = localhost
-rabbit_port = 5672
+rabbit_host = {{ RABBITMQ_HOST }}
+rabbit_port = {{ RABBITMQ_PORT }}
rabbit_use_ssl = false
-rabbit_userid = guest
-rabbit_password = guest
+rabbit_userid = {{ RABBITMQ_USER }}
+rabbit_password = {{ RABBITMQ_PASSWORD }}
rabbit_virtual_host = /
rabbit_notification_exchange = glance
rabbit_notification_topic = notifications
@@ -107,22 +107,22 @@ 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 ==============================
@@ -163,6 +163,7 @@ qpid_tcp_nodelay = True
# Deprecated group/name - [DATABASE]/sql_connection
# Deprecated group/name - [sql]/connection
#connection = <None>
+connection=postgresql://{{ GLANCE_DB_USER }}:{{ GLANCE_DB_PASSWORD }}@{{ CONTROLLER_HOST_ADDRESS }}/glance
# The SQL mode to be used for MySQL sessions. This option,
# including the default, overrides any server-set SQL mode. To
@@ -243,10 +244,11 @@ qpid_tcp_nodelay = True
#db_max_retries = 20
[keystone_authtoken]
-identity_uri = http://127.0.0.1:35357
-admin_tenant_name = %SERVICE_TENANT_NAME%
-admin_user = %SERVICE_USER%
-admin_password = %SERVICE_PASSWORD%
+auth_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0
+identity_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:35357
+admin_tenant_name = service
+admin_user = {{ GLANCE_SERVICE_USER }}
+admin_password = {{ GLANCE_SERVICE_PASSWORD }}
[paste_deploy]
# Name of the paste configuration file that defines the available pipelines
@@ -256,7 +258,7 @@ admin_password = %SERVICE_PASSWORD%
# service name removed. For example, if your paste section name is
# [pipeline:glance-registry-keystone], you would configure the flavor below
# as 'keystone'.
-#flavor=
+flavor=keystone
[profiler]
# If False fully disable profiling feature.