From 77fa02b655cee6101ee8c5aefc24336812564502 Mon Sep 17 00:00:00 2001 From: Steve Wilkerson Date: Mon, 3 Jun 2019 12:35:39 -0500 Subject: [PATCH] Armada: Remove logging overrides from OSH manifest This removes the logging overrides for using the oslo log fluentd handler and formatter from the armada-osh manifest. As the armada jobs in the openstack-helm repo no longer deploy the lma components, there's no fluentd instance for the openstack services to log to Change-Id: I6aed11871046a2caf705a3c444d169d1d977bdee Signed-off-by: Steve Wilkerson --- .../armada/manifests/armada-osh.yaml | 393 ------------------ 1 file changed, 393 deletions(-) diff --git a/tools/deployment/armada/manifests/armada-osh.yaml b/tools/deployment/armada/manifests/armada-osh.yaml index c0671cfd33..8640117d14 100644 --- a/tools/deployment/armada/manifests/armada-osh.yaml +++ b/tools/deployment/armada/manifests/armada-osh.yaml @@ -283,73 +283,7 @@ data: component: test values: release_uuid: ${RELEASE_UUID} - conf: - logging: - loggers: - keys: - - root - - keystone - handlers: - keys: - - stdout - - stderr - - 'null' - - fluent - formatters: - keys: - - context - - default - - fluent - logger_root: - level: WARNING - handlers: 'null' - logger_keystone: - level: INFO - handlers: - - fluent - - stdout - qualname: keystone - logger_amqp: - level: WARNING - handlers: stderr - qualname: amqp - logger_amqplib: - level: WARNING - handlers: stderr - qualname: amqplib - logger_eventletwsgi: - level: WARNING - handlers: stderr - qualname: eventlet.wsgi.server - logger_sqlalchemy: - level: WARNING - handlers: stderr - qualname: sqlalchemy - logger_boto: - level: WARNING - handlers: stderr - qualname: boto - handler_null: - class: logging.NullHandler - formatter: default - args: () - handler_stdout: - class: StreamHandler - args: (sys.stdout,) - formatter: context - handler_stderr: - class: StreamHandler - args: (sys.stderr,) - formatter: context - formatter_context: - class: oslo_log.formatters.ContextFormatter - datefmt: "%Y-%m-%d %H:%M:%S" - formatter_default: - format: "%(message)s" - datefmt: "%Y-%m-%d %H:%M:%S" endpoints: - fluentd: - namespace: osh-infra identity: name: keystone namespace: openstack @@ -489,73 +423,7 @@ data: component: test values: release_uuid: ${RELEASE_UUID} - conf: - logging: - loggers: - keys: - - root - - glance - handlers: - keys: - - stdout - - stderr - - 'null' - - fluent - formatters: - keys: - - context - - default - - fluent - logger_root: - level: WARNING - handlers: 'null' - logger_glance: - level: INFO - handlers: - - fluent - - stdout - qualname: glance - logger_amqp: - level: WARNING - handlers: stderr - qualname: amqp - logger_amqplib: - level: WARNING - handlers: stderr - qualname: amqplib - logger_eventletwsgi: - level: WARNING - handlers: stderr - qualname: eventlet.wsgi.server - logger_sqlalchemy: - level: WARNING - handlers: stderr - qualname: sqlalchemy - logger_boto: - level: WARNING - handlers: stderr - qualname: boto - handler_null: - class: logging.NullHandler - formatter: default - args: () - handler_stdout: - class: StreamHandler - args: (sys.stdout,) - formatter: context - handler_stderr: - class: StreamHandler - args: (sys.stderr,) - formatter: context - formatter_context: - class: oslo_log.formatters.ContextFormatter - datefmt: "%Y-%m-%d %H:%M:%S" - formatter_default: - format: "%(message)s" - datefmt: "%Y-%m-%d %H:%M:%S" endpoints: - fluentd: - namespace: osh-infra identity: auth: admin: @@ -637,8 +505,6 @@ data: values: release_uuid: ${RELEASE_UUID} endpoints: - fluentd: - namespace: osh-infra identity: auth: admin: @@ -685,69 +551,6 @@ data: scheduler: 1 backup: 1 conf: - logging: - loggers: - keys: - - root - - cinder - handlers: - keys: - - stdout - - stderr - - 'null' - - fluent - formatters: - keys: - - context - - default - - fluent - logger_root: - level: WARNING - handlers: 'null' - logger_cinder: - level: INFO - handlers: - - fluent - - stdout - qualname: cinder - logger_amqp: - level: WARNING - handlers: stderr - qualname: amqp - logger_amqplib: - level: WARNING - handlers: stderr - qualname: amqplib - logger_eventletwsgi: - level: WARNING - handlers: stderr - qualname: eventlet.wsgi.server - logger_sqlalchemy: - level: WARNING - handlers: stderr - qualname: sqlalchemy - logger_boto: - level: WARNING - handlers: stderr - qualname: boto - handler_null: - class: logging.NullHandler - formatter: default - args: () - handler_stdout: - class: StreamHandler - args: (sys.stdout,) - formatter: context - handler_stderr: - class: StreamHandler - args: (sys.stderr,) - formatter: context - formatter_context: - class: oslo_log.formatters.ContextFormatter - datefmt: "%Y-%m-%d %H:%M:%S" - formatter_default: - format: "%(message)s" - datefmt: "%Y-%m-%d %H:%M:%S" cinder: DEFAULT: backup_driver: cinder.backup.drivers.swift @@ -884,8 +687,6 @@ data: values: release_uuid: ${RELEASE_UUID} endpoints: - fluentd: - namespace: osh-infra identity: name: keystone auth: @@ -974,69 +775,6 @@ data: scheduler: 2 novncproxy: 1 conf: - logging: - loggers: - keys: - - root - - nova - handlers: - keys: - - stdout - - stderr - - 'null' - - fluent - formatters: - keys: - - context - - default - - fluent - logger_root: - level: WARNING - handlers: 'null' - logger_nova: - level: INFO - handlers: - - fluent - - stdout - qualname: nova - logger_amqp: - level: WARNING - handlers: stderr - qualname: amqp - logger_amqplib: - level: WARNING - handlers: stderr - qualname: amqplib - logger_eventletwsgi: - level: WARNING - handlers: stderr - qualname: eventlet.wsgi.server - logger_sqlalchemy: - level: WARNING - handlers: stderr - qualname: sqlalchemy - logger_boto: - level: WARNING - handlers: stderr - qualname: boto - handler_null: - class: logging.NullHandler - formatter: default - args: () - handler_stdout: - class: StreamHandler - args: (sys.stdout,) - formatter: context - handler_stderr: - class: StreamHandler - args: (sys.stderr,) - formatter: context - formatter_context: - class: oslo_log.formatters.ContextFormatter - datefmt: "%Y-%m-%d %H:%M:%S" - formatter_default: - format: "%(message)s" - datefmt: "%Y-%m-%d %H:%M:%S" nova: neutron: metadata_proxy_shared_secret: ${METADATA_PROXY_SHARED_SECRET} @@ -1095,8 +833,6 @@ data: values: release_uuid: ${RELEASE_UUID} endpoints: - fluentd: - namespace: osh-infra identity: auth: admin: @@ -1159,69 +895,6 @@ data: interface: tunnel: ${TUNNEL_DEVICE} conf: - logging: - loggers: - keys: - - root - - neutron - handlers: - keys: - - stdout - - stderr - - 'null' - - fluent - formatters: - keys: - - context - - default - - fluent - logger_root: - level: WARNING - handlers: 'null' - logger_neutron: - level: INFO - handlers: - - fluent - - stdout - qualname: neutron - logger_amqp: - level: WARNING - handlers: stderr - qualname: amqp - logger_amqplib: - level: WARNING - handlers: stderr - qualname: amqplib - logger_eventletwsgi: - level: WARNING - handlers: stderr - qualname: eventlet.wsgi.server - logger_sqlalchemy: - level: WARNING - handlers: stderr - qualname: sqlalchemy - logger_boto: - level: WARNING - handlers: stderr - qualname: boto - handler_null: - class: logging.NullHandler - formatter: default - args: () - handler_stdout: - class: StreamHandler - args: (sys.stdout,) - formatter: context - handler_stderr: - class: StreamHandler - args: (sys.stderr,) - formatter: context - formatter_context: - class: oslo_log.formatters.ContextFormatter - datefmt: "%Y-%m-%d %H:%M:%S" - formatter_default: - format: "%(message)s" - datefmt: "%Y-%m-%d %H:%M:%S" neutron: DEFAULT: l3_ha: True @@ -1278,73 +951,7 @@ data: component: test values: release_uuid: ${RELEASE_UUID} - conf: - logging: - loggers: - keys: - - root - - heat - handlers: - keys: - - stdout - - stderr - - 'null' - - fluent - formatters: - keys: - - context - - default - - fluent - logger_root: - level: WARNING - handlers: 'null' - logger_heat: - level: INFO - handlers: - - fluent - - stdout - qualname: heat - logger_amqp: - level: WARNING - handlers: stderr - qualname: amqp - logger_amqplib: - level: WARNING - handlers: stderr - qualname: amqplib - logger_eventletwsgi: - level: WARNING - handlers: stderr - qualname: eventlet.wsgi.server - logger_sqlalchemy: - level: WARNING - handlers: stderr - qualname: sqlalchemy - logger_boto: - level: WARNING - handlers: stderr - qualname: boto - handler_null: - class: logging.NullHandler - formatter: default - args: () - handler_stdout: - class: StreamHandler - args: (sys.stdout,) - formatter: context - handler_stderr: - class: StreamHandler - args: (sys.stderr,) - formatter: context - formatter_context: - class: oslo_log.formatters.ContextFormatter - datefmt: "%Y-%m-%d %H:%M:%S" - formatter_default: - format: "%(message)s" - datefmt: "%Y-%m-%d %H:%M:%S" endpoints: - fluentd: - namespace: osh-infra identity: auth: admin: