[openstack-ironic-discoverd] 0.2.1-2: add unit and configuration for dnsmasq

[Dmitry Tantsur]

commit 7745bdac3c9aa098e0e56c57075bbf695a83db9f
Author: Dmitry Tantsur <divius.inside at gmail.com>
Date:   Thu Oct 23 09:59:04 2014 +0200

    0.2.1-2: add unit and configuration for dnsmasq

 dnsmasq.conf                               |   10 ++++++++++
 openstack-ironic-discoverd-dnsmasq.service |   11 +++++++++++
 openstack-ironic-discoverd.spec            |   18 ++++++++++++++++--
 3 files changed, 37 insertions(+), 2 deletions(-)
---
diff --git a/dnsmasq.conf b/dnsmasq.conf
new file mode 100644
index 0000000..93ffc6a
--- /dev/null
+++ b/dnsmasq.conf
@@ -0,0 +1,10 @@
+# This is the recommend minimum for using discovery
+port=0
+bind-interfaces
+enable-tftp
+
+# These values do not have reasonable defaults
+#tftp-root=/tftpboot
+#interface=
+#dhcp-range=
+#dhcp-boot=
diff --git a/openstack-ironic-discoverd-dnsmasq.service b/openstack-ironic-discoverd-dnsmasq.service
new file mode 100644
index 0000000..7202c88
--- /dev/null
+++ b/openstack-ironic-discoverd-dnsmasq.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=PXE boot dnsmasq service for ironic-discoverd
+After=openvswitch.service
+
+[Service]
+Type=forking
+ExecStart=/sbin/dnsmasq --conf-file=/etc/ironic-discoverd/dnsmasq.conf
+
+[Install]
+WantedBy=multi-user.target
+Alias=openstack-ironic-discoverd-dnsmasq.service
diff --git a/openstack-ironic-discoverd.spec b/openstack-ironic-discoverd.spec
index ccd36ff..1b755a9 100644
--- a/openstack-ironic-discoverd.spec
+++ b/openstack-ironic-discoverd.spec
@@ -3,13 +3,15 @@
 Name:		openstack-ironic-discoverd
 Summary:	Hardware discovery daemon for OpenStack Ironic
 Version:	0.2.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
 URL:		https://github.com/Divius/ironic-discoverd
 
 Source0:	https://pypi.python.org/packages/source/i/ironic-discoverd/ironic-discoverd-%{version}.tar.gz
 Source1:	openstack-ironic-discoverd.service
+Source2:	openstack-ironic-discoverd-dnsmasq.service
+Source3:	dnsmasq.conf
 
 BuildArch:	noarch
 BuildRequires:	python-setuptools
@@ -24,6 +26,7 @@ Requires: python-ironicclient
 Requires: python-keystoneclient
 Requires: python-requests
 Requires: python-six
+Requires: dnsmasq
 
 
 %prep
@@ -41,13 +44,15 @@ install -p -D -m 644 ironic-discoverd.8 %{buildroot}%{_mandir}/man8/
 # install systemd scripts
 mkdir -p %{buildroot}%{_unitdir}
 install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
+install -p -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}
 
 # configuration contains passwords, thus 640
 install -p -D -m 640 example.conf %{buildroot}/%{_sysconfdir}/ironic-discoverd/discoverd.conf
+install -p -D -m 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/ironic-discoverd/dnsmasq.conf
 
 
 %description
-Simple hardware properties discovery daemon for use with OpenStack Ironic.
+Hardware properties discovery daemon for use with OpenStack Ironic.
 
 %files
 %doc README.rst
@@ -56,20 +61,29 @@ Simple hardware properties discovery daemon for use with OpenStack Ironic.
 %config(noreplace) %attr(-,root,root) %{_sysconfdir}/ironic-discoverd
 %{_bindir}/ironic-discoverd
 %{_unitdir}/openstack-ironic-discoverd.service
+%{_unitdir}/openstack-ironic-discoverd-dnsmasq.service
 %doc %{_mandir}/man8/ironic-discoverd.8.gz
 
 %post
 %systemd_post openstack-ironic-discoverd.service
+%systemd_post openstack-ironic-discoverd-dnsmasq.service
 
 %preun
 %systemd_preun openstack-ironic-discoverd.service
+%systemd_preun openstack-ironic-discoverd-dnsmasq.service
 
 %postun
 %systemd_postun_with_restart openstack-ironic-discoverd.service
+%systemd_postun_with_restart openstack-ironic-discoverd-dnsmasq.service
 
 
 %changelog
 
+* Thu Oct 23 2014 Dmitry Tantsur <dtantsur at redhat.com> - 0.2.1-2
+- Require dnsmasq
+- Add openstack-ironic-discoverd-dnsmasq.service - sample service for dnsmasq
+- Updated description to upstream version
+
 * Thu Oct 16 2014 Dmitry Tantsur <dtantsur at redhat.com> - 0.2.1-1
 - Upstream bugfix release