packages/openstack-ironic-inspector
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!4 modify spec file: add inspector-dist.conf; add config-file option to service

Browse Source 
From: @joec88
Reviewed-by: @xiyuanwang,@xiyuanwang
Signed-off-by:
This commit is contained in:
openeuler-ci-bot 2021-03-16 14:22:26 +08:00 committed by Gitee
commit cd778eeb6b
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack-ironic-inspector.service
View File

@ -3,7 +3,7 @@ Description=Hardware introspection service for OpenStack Ironic
After=syslog.target network.target After=syslog.target network.target
[Service] [Service]
ExecStart=/usr/bin/ironic-inspector ExecStart=/usr/bin/ironic-inspector --config-file /etc/ironic-inspector/inspector.conf
User=ironic-inspector User=ironic-inspector
Restart=on-failure Restart=on-failure

15
openstack-ironic-inspector.spec
View File

@ -1,6 +1,6 @@
Name: openstack-ironic-inspector Name: openstack-ironic-inspector
Version: 10.5.0 Version: 10.5.0
Release: 2 Release: 3
Summary: Hardware introspection service for OpenStack Ironic Summary: Hardware introspection service for OpenStack Ironic
License: ASL 2.0 License: ASL 2.0
URL: https://launchpad.net/ironic-inspector 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 configuration files
install -d -m 750 %{buildroot}%{_sysconfdir}/ironic-inspector 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 install -p -D -m 640 %{SOURCE4} %{buildroot}/%{_sysconfdir}/ironic-inspector/dnsmasq.conf
# rootwrap configuration # rootwrap configuration
@ -239,8 +243,10 @@ exit 0
%dir %{_sysconfdir}/ironic-inspector %dir %{_sysconfdir}/ironic-inspector
%config(noreplace) %{_sysconfdir}/logrotate.d/openstack-ironic-inspector %config(noreplace) %{_sysconfdir}/logrotate.d/openstack-ironic-inspector
%config(noreplace) %{_sysconfdir}/sudoers.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/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 %config %{_sysconfdir}/ironic-inspector/rootwrap.conf
%dir %{_sysconfdir}/ironic-inspector/rootwrap.d %dir %{_sysconfdir}/ironic-inspector/rootwrap.d
%config(noreplace) %{_sysconfdir}/ironic-inspector/rootwrap.d/ironic-inspector.filters %config(noreplace) %{_sysconfdir}/ironic-inspector/rootwrap.d/ironic-inspector.filters
@ -269,6 +275,9 @@ exit 0
%{_bindir}/ironic-inspector-conductor %{_bindir}/ironic-inspector-conductor
%changelog %changelog
* Mon Mar 15 2021 joec88<chens141@chinaunicom.cn> - 10.5.0-3
- Add inspector-dist.conf; Add config-file option to service
* Thu Mar 11 2021 wangxiyuan<wangxiyuan1007@gmail.com> - 10.5.0-2 * Thu Mar 11 2021 wangxiyuan<wangxiyuan1007@gmail.com> - 10.5.0-2
- Fix sudoers file parse error - Fix sudoers file parse error