openstack/instack-undercloud
Code Issues Proposed changes

Merge pull request #70 from Divius/ironic-discoverd-packages

Browse Source 
Package installation of ironic-discoverd
This commit is contained in:
James Slagle 2014-10-23 08:21:08 -04:00
commit b51d5d46b6
5 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
elements/ironic-discoverd/install.d/60-ironic-discoverd
View File

@ -1,8 +0,0 @@
#!/bin/bash
set -eux
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

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

7
elements/ironic-discoverd/install.d/ironic-discoverd-package-install/60-ironic-discoverd Executable file
View File

@ -0,0 +1,7 @@
#!/bin/bash
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/2.fc22/noarch/openstack-ironic-discoverd-0.2.1-2.fc22.noarch.rpm
# install-packages openstack-ironic-discoverd

10
elements/ironic-discoverd/install.d/50-discovery-dnsmasq → elements/ironic-discoverd/install.d/ironic-discoverd-source-install/60-ironic-discoverd
View File

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

1
elements/undercloud-package-install/environment.d/00-package-install
View File

@ -40,3 +40,4 @@ export DIB_INSTALLTYPE_tripleo_heat_templates=${DIB_INSTALLTYPE_tripleo_heat_tem
# Miscellaneous
export DIB_INSTALLTYPE_get_pip_py=${DIB_INSTALLTYPE_get_pip_py:-package}
export DIB_INSTALLTYPE_novnc=${DIB_INSTALLTYPE_novnc:-package}
export DIB_INSTALLTYPE_ironic_discoverd=${DIB_INSTALLTYPE_ironic_discoverd:-package}