openstack/instack-undercloud
Code Issues Proposed changes

Make possible to install ironic-discoverd from RPM

Browse Source
This commit is contained in:
Dmitry Tantsur 2014-10-21 16:48:12 +02:00
parent 1f41d940dc
commit 070334c424
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,8 @@
#!/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/1.fc22/noarch/openstack-ironic-discoverd-0.2.1-1.fc22.noarch.rpm
# install-packages openstack-ironic-discoverd
install -d -m 0755 -o ironic -g ironic /tftpboot/pxelinux.cfg

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

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}

2
scripts/instack-install-undercloud-source
View File

@ -203,6 +203,8 @@ sudo yum install -y policycoreutils-python
# ensure latest policy
sudo yum install -y selinux-policy
export DIB_INSTALLTYPE_ironic_discoverd=source
if [ "$RUN_INSTACK" -eq 0 ]; then
echo "Exiting without running instack."
exit 0