From 2641fe01434f36699a1a88023dfa76a4a356ac70 Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@redhat.com>
Date: Tue, 8 Sep 2015 16:39:02 +0200
Subject: [PATCH] Install ironic-agent dependencies via package-installs

Some were still installed in shell scripts.

Change-Id: I96c55274c764fa04dc00863dcff3677fe9603d2a
---
 .../ironic-agent-source-install/60-ironic-agent-install   | 1 -
 elements/ironic-agent/package-installs.yaml               | 7 +++++++
 elements/ironic-agent/pkg-map                             | 8 ++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/elements/ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install b/elements/ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install
index 4b7b1c03b..0cac68f59 100755
--- a/elements/ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install
+++ b/elements/ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install
@@ -7,7 +7,6 @@ set -eu
 set -o pipefail
 
 SCRIPTDIR=$(dirname $0)
-install-packages python-dev qemu-utils parted hdparm util-linux genisoimage gcc
 
 # Install the latest version of pip and setuptools which has some
 # fixes for building behind proxy.
diff --git a/elements/ironic-agent/package-installs.yaml b/elements/ironic-agent/package-installs.yaml
index 62a691aa4..db766b97b 100644
--- a/elements/ironic-agent/package-installs.yaml
+++ b/elements/ironic-agent/package-installs.yaml
@@ -3,3 +3,10 @@ curl:
 # this one requires workaround with dnf - see 80-ironic-agent for details
 dmidecode:
 ipmitool:
+qemu-utils:
+gcc:
+python-dev:
+parted:
+hdparm:
+util-linux:
+genisoimage:
diff --git a/elements/ironic-agent/pkg-map b/elements/ironic-agent/pkg-map
index 576d705d3..09c2c93ef 100644
--- a/elements/ironic-agent/pkg-map
+++ b/elements/ironic-agent/pkg-map
@@ -15,7 +15,9 @@
     "redhat": {
       "tgt": "scsi-target-utils",
       "curl": "curl",
-      "ironic-python-agent": "openstack-ironic-python-agent"
+      "ironic-python-agent": "openstack-ironic-python-agent",
+      "qemu-utils": "qemu-img",
+      "python-dev": "python2-devel"
     },
     "debian": {
       "tgt": "tgt",
@@ -25,6 +27,8 @@
   "default": {
     "tgt": "tgt",
     "curl": "curl",
-    "ironic-python-agent": "openstack-ironic-python-agent"
+    "ironic-python-agent": "openstack-ironic-python-agent",
+    "qemu-utils": "qemu-utils",
+    "python-dev": "python-dev"
   }
 }