openstack
/
instack-undercloud
Code Issues Proposed changes

Disable source install of discoverd and drop redundant line

This commit is contained in:
Dmitry Tantsur 2014-10-23 14:00:45 +02:00
parent b3347784de
commit ec6a1f177a
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,4 +5,3 @@ 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
install -d -m 0755 -o ironic -g ironic /tftpboot/pxelinux.cfg

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

@ -203,8 +203,6 @@ 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