openstack
/
instack-undercloud
Code Issues Proposed changes

Also switch discovery dnsmasq to package install

This commit is contained in:
Dmitry Tantsur 2014-10-23 12:59:46 +02:00
parent 070334c424
commit b3347784de
4 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
elements/ironic-discoverd/install.d/50-discovery-dnsmasq
View File

@ -1,23 +0,0 @@
#!/bin/bash
# just starts the discovery dnsmasq process
set -eux
install-packages dnsmasq dnsmasq-utils
# make sure tftpboot is labelled correctly
mkdir -p /tftpboot
restorecon -R /tftpboot
cat > /lib/systemd/system/openstack-ironic-discoverd-dnsmasq.service << eof
[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
eof

7
elements/ironic-discoverd/install.d/70-tftpboot-dir Executable file
View File

@ -0,0 +1,7 @@
#!/bin/bash
set -eux
# make sure tftpboot is labelled correctly
install -d -m 0755 -o ironic -g ironic /tftpboot/pxelinux.cfg
restorecon -R /tftpboot

2
elements/ironic-discoverd/install.d/ironic-discoverd-package-install/60-ironic-discoverd
View File

@ -3,6 +3,6 @@
set -eux
# FIXME(dtantsur): temporary until update hits Juno RDO
rpm -q openstack-ironic-discoverd || yum -y install https://kojipkgs.fedoraproject.org//packages/openstack-ironic-discoverd/0.2.1/1.fc22/noarch/openstack-ironic-discoverd-0.2.1-1.fc22.noarch.rpm
rpm -q openstack-ironic-discoverd || yum -y install https://kojipkgs.fedoraproject.org//packages/openstack-ironic-discoverd/0.2.1/2.fc22/noarch/openstack-ironic-discoverd-0.2.1-2.fc22.noarch.rpm
# install-packages openstack-ironic-discoverd
install -d -m 0755 -o ironic -g ironic /tftpboot/pxelinux.cfg

17
elements/ironic-discoverd/install.d/ironic-discoverd-source-install/60-ironic-discoverd
View File

@ -2,7 +2,22 @@
set -eux
install-packages dnsmasq
pip install ironic-discoverd
os-svc-daemon -n openstack-ironic-discoverd -i /usr -u root -c ironic-discoverd /etc/ironic-discoverd/discoverd.conf
install -d -m 0750 -o root -g root /etc/ironic-discoverd
install -d -m 0755 -o ironic -g ironic /tftpboot/pxelinux.cfg
cat > /lib/systemd/system/openstack-ironic-discoverd-dnsmasq.service << eof
[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
eof