diff --git a/config.yaml b/config.yaml index d618453f..813307e9 100644 --- a/config.yaml +++ b/config.yaml @@ -41,6 +41,14 @@ options: default: False description: | If set to True, supporting services will log to syslog. + debug: + default: False + type: boolean + description: Enable debug logging + verbose: + default: False + type: boolean + description: Enable verbose logging # HA configuration settings vip: type: string diff --git a/hooks/glance_utils.py b/hooks/glance_utils.py index f54cfc7c..47e157fe 100755 --- a/hooks/glance_utils.py +++ b/hooks/glance_utils.py @@ -79,7 +79,8 @@ CONFIG_FILES = OrderedDict([ 'hook_contexts': [context.SharedDBContext(ssl_dir=GLANCE_CONF_DIR), context.PostgresqlDBContext(), context.IdentityServiceContext(), - context.SyslogContext()], + context.SyslogContext(), + context.OSConfigFlagContext()], 'services': ['glance-registry'] }), (GLANCE_API_CONF, { @@ -90,7 +91,8 @@ CONFIG_FILES = OrderedDict([ glance_contexts.CephGlanceContext(), glance_contexts.ObjectStoreContext(), glance_contexts.HAProxyContext(), - context.SyslogContext()], + context.SyslogContext(), + context.OSConfigFlagContext()], 'services': ['glance-api'] }), (GLANCE_API_PASTE_INI, { diff --git a/templates/icehouse/glance-api.conf b/templates/icehouse/glance-api.conf index b1b04fb8..03489d03 100644 --- a/templates/icehouse/glance-api.conf +++ b/templates/icehouse/glance-api.conf @@ -1,7 +1,7 @@ [DEFAULT] -verbose = True +verbose = {{ verbose }} use_syslog = {{ use_syslog }} -debug = True +debug = {{ debug }} {% if rbd_pool -%} default_store = rbd diff --git a/templates/icehouse/glance-registry.conf b/templates/icehouse/glance-registry.conf index 9dc3576b..1908f562 100644 --- a/templates/icehouse/glance-registry.conf +++ b/templates/icehouse/glance-registry.conf @@ -1,7 +1,8 @@ [DEFAULT] -verbose = True +verbose = {{ verbose }} use_syslog = {{ use_syslog }} -debug = True +debug = {{ debug }} + bind_host = 0.0.0.0 bind_port = 9191 log_file = /var/log/glance/registry.log