From 5f68750b4b152a927d7f3ab4dc21b73d24733081 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Tue, 11 Aug 2015 13:11:28 +0200 Subject: [PATCH] ironic-agent: ensure dmidecode and ipmitool are installed Currently they are used for inspection, but may be also used for other purposes, as they're accessed from IPA generic hardware layer. Change-Id: I32c6a711d466131b9445023812a2a260ed2e01f3 --- elements/ironic-agent/package-installs.yaml | 3 +++ elements/ironic-agent/post-install.d/80-ironic-agent | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/elements/ironic-agent/package-installs.yaml b/elements/ironic-agent/package-installs.yaml index 62fadc280..62a691aa4 100644 --- a/elements/ironic-agent/package-installs.yaml +++ b/elements/ironic-agent/package-installs.yaml @@ -1,2 +1,5 @@ tgt: curl: +# this one requires workaround with dnf - see 80-ironic-agent for details +dmidecode: +ipmitool: diff --git a/elements/ironic-agent/post-install.d/80-ironic-agent b/elements/ironic-agent/post-install.d/80-ironic-agent index 72811d8f0..715266b9d 100755 --- a/elements/ironic-agent/post-install.d/80-ironic-agent +++ b/elements/ironic-agent/post-install.d/80-ironic-agent @@ -7,6 +7,12 @@ set -eu set -o pipefail 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 case "$DIB_INIT_SYSTEM" in