From b502740e52bbc810c3240501258795527ab8a3d2 Mon Sep 17 00:00:00 2001 From: Fabien Boucher Date: Oct 30 2019 11:51:05 +0000 Subject: Remove not used logging.conf --- diff --git a/.gitignore b/.gitignore index bd56637..82642a1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /nodepool-3.0.0.tar.gz /3.9.0.tar.gz +results_nodepool diff --git a/logging.conf b/logging.conf deleted file mode 100644 index 4a1424d..0000000 --- a/logging.conf +++ /dev/null @@ -1,65 +0,0 @@ -[loggers] -keys=root,nodepool,shade,kazoo,keystoneauth,novaclient - -[handlers] -keys=console,normal - -[formatters] -keys=console,normal - - -[logger_root] -handlers=console,normal -level=WARNING - -[logger_nodepool] -handlers=console,normal -propagate=0 -qualname=nodepool -level=INFO - -[logger_shade] -level=WARNING -handlers=console -qualname=shade -propagate=0 - -[logger_keystoneauth] -level=WARNING -handlers=console -qualname=keystoneauth -propagate=0 - -[logger_novaclient] -level=WARNING -handlers=console -qualname=novaclient -propagate=0 - -[logger_kazoo] -level=WARNING -handlers=console -qualname=kazoo -propagate=0 - - -[handler_console] -level=INFO -class=StreamHandler -formatter=console -args=(sys.stdout,) - -[handler_normal] -level=DEBUG -class=logging.handlers.TimedRotatingFileHandler -formatter=normal -args=('/var/log/nodepool/nodepool.log', 'H', 8, 30,) - - -[formatter_normal] -format=%(asctime)s %(levelname)s %(name)s: %(message)s -datefmt= - -[formatter_console] -format=%(levelname)7s %(name)s: %(message)s -datefmt= diff --git a/nodepool.spec b/nodepool.spec index d36af67..5332cb5 100644 --- a/nodepool.spec +++ b/nodepool.spec @@ -16,10 +16,9 @@ Source1: nodepool-launcher.service Source2: nodepool-builder.service Source10: nodepool.yaml Source11: secure.conf -Source12: logging.conf -Source13: launcher-logging.yaml -Source14: builder-logging.yaml -Source15: sudoer +Source12: launcher-logging.yaml +Source13: builder-logging.yaml +Source14: sudoer Patch0: 0001-Remove-uneeded-shebang-and-exec-bit-on-some-files.patch @@ -119,10 +118,9 @@ install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/nodepool-launcher.servi install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/nodepool-builder.service install -p -D -m 0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/nodepool/nodepool.yaml install -p -D -m 0640 %{SOURCE11} %{buildroot}%{_sysconfdir}/nodepool/secure.conf -install -p -D -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/nodepool/logging.conf -install -p -D -m 0644 %{SOURCE13} %{buildroot}%{_sysconfdir}/nodepool/launcher-logging.yaml -install -p -D -m 0644 %{SOURCE14} %{buildroot}%{_sysconfdir}/nodepool/builder-logging.yaml -install -p -D -m 0644 %{SOURCE15} %{buildroot}%{_sysconfdir}/sudoers.d/nodepool +install -p -D -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/nodepool/launcher-logging.yaml +install -p -D -m 0644 %{SOURCE13} %{buildroot}%{_sysconfdir}/nodepool/builder-logging.yaml +install -p -D -m 0644 %{SOURCE14} %{buildroot}%{_sysconfdir}/sudoers.d/nodepool install -p -d -m 0755 %{buildroot}%{_sysconfdir}/nodepool/scripts install -p -d -m 0755 %{buildroot}%{_sysconfdir}/nodepool/elements install -p -d -m 0750 %{buildroot}%{_sharedstatedir}/nodepool @@ -159,7 +157,6 @@ exit 0 %files %{_bindir}/nodepool -%config(noreplace) %attr(0644, root, root) %{_sysconfdir}/nodepool/logging.conf %config(noreplace) %attr(0644, root, root) %{_sysconfdir}/nodepool/nodepool.yaml %config(noreplace) %attr(0644, root, nodepool) %{_sysconfdir}/nodepool/secure.conf %dir %{_sysconfdir}/nodepool/scripts