openstack/diskimage-builder
Code Issues Proposed changes

Merge "Remove dnf workaround in ironic-agent"

Browse Source
This commit is contained in:
Jenkins 2015-09-24 11:01:30 +00:00 committed by Gerrit Code Review
commit bbea877f2c
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elements/ironic-agent/package-installs.yaml
View File

@ -1,6 +1,5 @@
tgt: tgt:
curl: curl:
# this one requires workaround with dnf - see 80-ironic-agent for details
dmidecode: dmidecode:
ipmitool: ipmitool:
qemu-utils: qemu-utils:

5
elements/ironic-agent/post-install.d/80-ironic-agent
View File

@ -7,11 +7,6 @@ set -eu
set -o pipefail set -o pipefail
install-packages -e python-dev git cloud-init install-packages -e python-dev git cloud-init
# dnf removes unused dependencies by default. As we installed cloud-init before
# dmidecode, dnf removes dmidecode above as an unused dependency.
# TODO(dtantsur): use `dnf mark` from dnf 1.1.1 in install-packages once this
# command is widely available.
install-packages dmidecode
rm -rf /tmp/ironic-python-agent rm -rf /tmp/ironic-python-agent