From 675996497e7da4c40d083634c5e1b9473613ff82 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Thu, 21 May 2015 16:23:04 +0000 Subject: Openstack: Add back the custom configuration for glance-api Add back the custom configuration for glance-api adapted for the OpenStack Kilo release. Change-Id: I40c69c1db38295fe725b36a454819f1823a1106c --- .../usr/share/openstack/glance/glance-api.conf | 62 +++++++++++----------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/install-files/openstack/usr/share/openstack/glance/glance-api.conf b/install-files/openstack/usr/share/openstack/glance/glance-api.conf index 6e85cbb5..9c2e6628 100644 --- a/install-files/openstack/usr/share/openstack/glance/glance-api.conf +++ b/install-files/openstack/usr/share/openstack/glance/glance-api.conf @@ -12,7 +12,7 @@ #image_size_cap = 1099511627776 # Address to bind the API server -bind_host = 0.0.0.0 +bind_host = {{ MANAGEMENT_INTERFACE_IP_ADDRESS }} # Port the bind the API server to bind_port = 9292 @@ -22,7 +22,7 @@ bind_port = 9292 # # 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/api.log +# log_file = /var/log/glance/api.log # Backlog requests when creating socket backlog = 4096 @@ -116,7 +116,7 @@ backlog = 4096 # 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_LOCAL0 @@ -151,7 +151,7 @@ backlog = 4096 # ============ Registry Options =============================== # Address to find the registry server -registry_host = 0.0.0.0 +registry_host = {{ MANAGEMENT_INTERFACE_IP_ADDRESS }} # Port the registry server is listening on registry_port = 9191 @@ -215,7 +215,7 @@ registry_client_protocol = http # 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 @@ -230,15 +230,15 @@ registry_client_protocol = http # disabled_notifications = [] # 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 @@ -246,22 +246,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 # ============ Delayed Delete Options ============================= @@ -337,6 +337,7 @@ image_cache_dir = /var/lib/glance/image-cache/ # Deprecated group/name - [DATABASE]/sql_connection # Deprecated group/name - [sql]/connection #connection = +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 @@ -431,10 +432,11 @@ image_cache_dir = /var/lib/glance/image-cache/ #lock_path = /tmp [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 }} revocation_cache_time = 10 [paste_deploy] @@ -445,7 +447,7 @@ revocation_cache_time = 10 # 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 [store_type_location_strategy] # The scheme list to use to get store preference order. The scheme must be -- cgit v1.2.1