From 598eeda522a95fa9dbc365ca722db8674a3088fb Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Sat, 25 Mar 2017 18:39:33 +0100
Subject: [PATCH] Install more packages with DIB

Eventually we don't want to be running puppet to create nodepool images.
This patch adds all the packages that were declared as puppet package
resources in openstack_project::template[1] to the infra-package-needs
element so that they will exist on the image with our without puppet
managing them.

[1] http://git.openstack.org/cgit/openstack-infra/system-config/tree/modules/openstack_project/manifests/template.pp#n167

Change-Id: Ie1a0aba57390c9c0b269b4cbb076090ae1de73a9
---
 .../infra-package-needs/package-installs.yaml        | 12 ++++++++++++
 nodepool/elements/infra-package-needs/pkg-map        |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/nodepool/elements/infra-package-needs/package-installs.yaml b/nodepool/elements/infra-package-needs/package-installs.yaml
index b67d460c59..0ae0f6ebaa 100644
--- a/nodepool/elements/infra-package-needs/package-installs.yaml
+++ b/nodepool/elements/infra-package-needs/package-installs.yaml
@@ -8,3 +8,15 @@ uuid-runtime:
 traceroute:
 ntpdate:
 gentoolkit:
+at:
+lvm2:
+strace:
+tcpdump:
+rsyslog:
+git:
+rsync:
+parted:
+puppet:
+wget:
+iputils-ping:
+dnsutils:
diff --git a/nodepool/elements/infra-package-needs/pkg-map b/nodepool/elements/infra-package-needs/pkg-map
index 783bafae4c..ea4c2a78ea 100644
--- a/nodepool/elements/infra-package-needs/pkg-map
+++ b/nodepool/elements/infra-package-needs/pkg-map
@@ -16,6 +16,8 @@
     "redhat": {
       "cron": "cronie",
       "build-essential": "glibc-devel gcc make",
+      "dnsutils": "bind-utils",
+      "iputils-ping": "iputils",
       "python-dev": "python-devel",
       "python3-dev": "",
       "uuid-runtime": ""