Add missing config options
Change-Id: Idbd66ff825600698554122b86e91b28062d4d170
This commit is contained in:
parent
6f35785d39
commit
cd07250eb6
|
@ -2,9 +2,12 @@
|
|||
output_file = etc/glare.conf.sample
|
||||
namespace = glare
|
||||
namespace = glance.store
|
||||
namespace = keystonemiddleware.auth_token
|
||||
namespace = oslo.concurrency
|
||||
namespace = oslo.db
|
||||
namespace = oslo.db.concurrency
|
||||
namespace = keystonemiddleware.auth_token
|
||||
namespace = oslo.log
|
||||
namespace = oslo.messaging
|
||||
namespace = oslo.middleware.cors
|
||||
namespace = oslo.middleware.http_proxy_to_wsgi
|
||||
namespace = oslo.policy
|
||||
|
|
|
@ -17,18 +17,18 @@ from oslo_log import log as logging
|
|||
import oslo_messaging
|
||||
from oslo_messaging import serializer
|
||||
|
||||
_ALIASES = {
|
||||
'glare.openstack.common.rpc.impl_kombu': 'rabbit',
|
||||
'glare.openstack.common.rpc.impl_qpid': 'qpid',
|
||||
'glare.openstack.common.rpc.impl_zmq': 'zmq',
|
||||
}
|
||||
|
||||
CONF = cfg.CONF
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
notifier_opts = [
|
||||
cfg.StrOpt('glare_publisher_id', default="artifact.localhost",
|
||||
help='Default publisher_id for outgoing '
|
||||
'Glare notifications.')]
|
||||
CONF.register_opts(notifier_opts)
|
||||
|
||||
|
||||
def get_transport():
|
||||
return oslo_messaging.get_notification_transport(CONF, aliases=_ALIASES)
|
||||
return oslo_messaging.get_notification_transport(CONF)
|
||||
|
||||
|
||||
class RequestSerializer(serializer.Serializer):
|
||||
|
@ -57,11 +57,6 @@ class Notifier(object):
|
|||
@classmethod
|
||||
def _get_notifier(cls):
|
||||
if cls.GLARE_NOTIFIER is None:
|
||||
notifier_opts = [
|
||||
cfg.StrOpt('glare_publisher_id', default="artifact",
|
||||
help='Default publisher_id for outgoing '
|
||||
'Glare notifications.')]
|
||||
CONF.register_opts(notifier_opts)
|
||||
cls.GLARE_NOTIFIER = oslo_messaging.Notifier(
|
||||
get_transport(),
|
||||
publisher_id=CONF.glare_publisher_id,
|
||||
|
|
|
@ -22,19 +22,23 @@ import itertools
|
|||
from osprofiler import opts as profiler
|
||||
|
||||
import glare.api.middleware.context
|
||||
import glare.api.v1.resource
|
||||
import glare.api.versions
|
||||
import glare.common.config
|
||||
import glare.common.wsgi
|
||||
import glare.notification
|
||||
import glare.objects.base
|
||||
import glare.objects.meta.registry
|
||||
|
||||
_artifacts_opts = [
|
||||
(None, list(itertools.chain(
|
||||
glare.api.middleware.context.context_opts,
|
||||
glare.api.v1.resource.list_configs,
|
||||
glare.api.versions.versions_opts,
|
||||
glare.common.wsgi.bind_opts,
|
||||
glare.common.wsgi.eventlet_opts,
|
||||
glare.common.wsgi.socket_opts,
|
||||
glare.notification.notifier_opts,
|
||||
glare.objects.base.artifact_opts,
|
||||
glare.objects.meta.registry.registry_options))),
|
||||
profiler.list_opts()[0],
|
||||
|
|
Loading…
Reference in New Issue