From 9e69a869daec7478e096e0165c6532cb549ec1e5 Mon Sep 17 00:00:00 2001 From: joec88 Date: Mon, 15 Mar 2021 14:12:24 +0800 Subject: [PATCH] modify spec file: add inspector-dist.conf; add config-file option to service --- openstack-ironic-inspector.service | 2 +- openstack-ironic-inspector.spec | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/openstack-ironic-inspector.service b/openstack-ironic-inspector.service index 31c010e..42441f2 100644 --- a/openstack-ironic-inspector.service +++ b/openstack-ironic-inspector.service @@ -3,7 +3,7 @@ Description=Hardware introspection service for OpenStack Ironic After=syslog.target network.target [Service] -ExecStart=/usr/bin/ironic-inspector +ExecStart=/usr/bin/ironic-inspector --config-file /etc/ironic-inspector/inspector.conf User=ironic-inspector Restart=on-failure diff --git a/openstack-ironic-inspector.spec b/openstack-ironic-inspector.spec index 145b39d..b00fc3a 100644 --- a/openstack-ironic-inspector.spec +++ b/openstack-ironic-inspector.spec @@ -1,6 +1,6 @@ Name: openstack-ironic-inspector Version: 10.5.0 -Release: 2 +Release: 3 Summary: Hardware introspection service for OpenStack Ironic License: ASL 2.0 URL: https://launchpad.net/ironic-inspector @@ -192,7 +192,11 @@ install -p -D -m 440 %{SOURCE1} %{buildroot}%{_sysconfdir}/sudoers.d/openstack-i # install configuration files install -d -m 750 %{buildroot}%{_sysconfdir}/ironic-inspector -install -p -D -m 640 %{SOURCE3} %{buildroot}/%{_sysconfdir}/ironic-inspector/ironic-inspector.conf +export PYTHONPATH=. +oslo-config-generator --config-file tools/config-generator.conf --output-file %{buildroot}/%{_sysconfdir}/ironic-inspector/inspector.conf +oslopolicy-sample-generator --config-file tools/policy-generator.conf --output-file %{buildroot}/%{_sysconfdir}/ironic-inspector/policy.json +chmod 0640 %{buildroot}/%{_sysconfdir}/ironic-inspector/inspector.conf +install -p -D -m 640 %{SOURCE3} %{buildroot}/%{_sysconfdir}/ironic-inspector/inspector-dist.conf install -p -D -m 640 %{SOURCE4} %{buildroot}/%{_sysconfdir}/ironic-inspector/dnsmasq.conf # rootwrap configuration @@ -239,8 +243,10 @@ exit 0 %dir %{_sysconfdir}/ironic-inspector %config(noreplace) %{_sysconfdir}/logrotate.d/openstack-ironic-inspector %config(noreplace) %{_sysconfdir}/sudoers.d/openstack-ironic-inspector -%config(noreplace) %attr(0640, root, ironic-inspector) %{_sysconfdir}/ironic-inspector/ironic-inspector.conf +%config(noreplace) %attr(0640, root, ironic-inspector) %{_sysconfdir}/ironic-inspector/inspector.conf %config(noreplace) %attr(0640, root, ironic-inspector) %{_sysconfdir}/ironic-inspector/dnsmasq.conf +%config(noreplace) %attr(0640, root, ironic-inspector) %{_sysconfdir}/ironic-inspector/inspector-dist.conf +%config(noreplace) %attr(0640, root, ironic-inspector) %{_sysconfdir}/ironic-inspector/policy.json %config %{_sysconfdir}/ironic-inspector/rootwrap.conf %dir %{_sysconfdir}/ironic-inspector/rootwrap.d %config(noreplace) %{_sysconfdir}/ironic-inspector/rootwrap.d/ironic-inspector.filters @@ -269,6 +275,9 @@ exit 0 %{_bindir}/ironic-inspector-conductor %changelog +* Mon Mar 15 2021 joec88 - 10.5.0-3 +- Add inspector-dist.conf; Add config-file option to service + * Thu Mar 11 2021 wangxiyuan - 10.5.0-2 - Fix sudoers file parse error