From b0e55c306b4d9619dbe1093f3d1fda2ec59e065a Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Thu, 27 Apr 2017 20:59:15 +0200
Subject: [PATCH] Reproduce non-puppet parts from install_puppet.sh

We want to stop installing puppet on nodepool nodes, but the
install_puppet.sh script does more than just that. This patch adds some
of the packages that install_puppet.sh was installing that are unrelated
to puppet or needed for more than just puppet.

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

diff --git a/nodepool/elements/infra-package-needs/package-installs.yaml b/nodepool/elements/infra-package-needs/package-installs.yaml
index 69643cc226..78bba3025d 100644
--- a/nodepool/elements/infra-package-needs/package-installs.yaml
+++ b/nodepool/elements/infra-package-needs/package-installs.yaml
@@ -23,3 +23,6 @@ iputils-ping:
 dnsutils:
 haveged:
 iptables:
+centos-release-openstack-ocata:
+redhat-rpm-config:
+redhat-lsb-core:
diff --git a/nodepool/elements/infra-package-needs/pkg-map b/nodepool/elements/infra-package-needs/pkg-map
index 885d475778..f58a714198 100644
--- a/nodepool/elements/infra-package-needs/pkg-map
+++ b/nodepool/elements/infra-package-needs/pkg-map
@@ -3,7 +3,9 @@
     "fedora": {
       "python3-dev": "python3-devel",
       "iptables": "iptables-services",
-      "haveged": "haveged"
+      "haveged": "haveged",
+      "redhat-rpm-config": "redhat-rpm-config",
+      "redhat-lsb-core": "redhat-lsb-core"
     },
     "gentoo": {
       "build-essential": "",
@@ -13,6 +15,9 @@
       "python3-dev": "",
       "traceroute": "net-analyzer/traceroute",
       "uuid-runtime": ""
+    },
+    "centos": {
+      "centos-release-openstack-ocata": "centos-release-openstack-ocata"
     }
   },
   "family": {
@@ -42,6 +47,9 @@
   },
   "default": {
     "iptables": "iptables-persistent",
-    "gentoolkit": ""
+    "gentoolkit": "",
+    "centos-release-openstack-ocata": "",
+    "redhat-rpm-config": "",
+    "redhat-lsb-core": ""
   }
 }