diff options
Diffstat (limited to 'openstack/etc/glance')
-rw-r--r-- | openstack/etc/glance/glance-api.conf | 40 | ||||
-rw-r--r-- | openstack/etc/glance/glance-registry-paste.ini | 2 |
2 files changed, 21 insertions, 21 deletions
diff --git a/openstack/etc/glance/glance-api.conf b/openstack/etc/glance/glance-api.conf index f53b1bb8..c866f675 100644 --- a/openstack/etc/glance/glance-api.conf +++ b/openstack/etc/glance/glance-api.conf @@ -234,15 +234,15 @@ registry_client_protocol = http # default_publisher_id = image.127.0.0.1 # 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 = 127.0.0.1 -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 @@ -250,22 +250,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 = 127.0.0.1 -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 = 127.0.0.1 +#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 # ============ Filesystem Store Options ======================== diff --git a/openstack/etc/glance/glance-registry-paste.ini b/openstack/etc/glance/glance-registry-paste.ini index d9f6eb35..ab8c2856 100644 --- a/openstack/etc/glance/glance-registry-paste.ini +++ b/openstack/etc/glance/glance-registry-paste.ini @@ -22,4 +22,4 @@ paste.filter_factory = glance.api.middleware.context:ContextMiddleware.factory paste.filter_factory = glance.api.middleware.context:UnauthenticatedContextMiddleware.factory [filter:authtoken] -paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory +paste.filter_factory = keystonemiddleware.auth_token:filter_factory |