From d62622552ba790b914d73d3ef29a449b7f244217 Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobreli@redhat.com>
Date: Fri, 15 Dec 2017 12:05:49 +0100
Subject: [PATCH] Replace deprecated packages installation

Fix undercloud deploy references to the deprecated packages:

* openstack-puppet-modules is deprecated, use puppet-tripleo instead
* use the openstack-heat-agents package to install all of the
  python-heat-agent packages, instead of having to specify
  each individually
  (follows-up I72caf6ff0dfa3f164737b92e89c1cc6043845864)

Change-Id: I3d7258415723143741b9059b73e2cc0dab870fa0
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
---
 roles/undercloud-deploy/README.md                      |  4 ++--
 .../templates/undercloud-deploy.sh.j2                  | 10 ++--------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/roles/undercloud-deploy/README.md b/roles/undercloud-deploy/README.md
index 7ac5dac5a..cf9341bb4 100644
--- a/roles/undercloud-deploy/README.md
+++ b/roles/undercloud-deploy/README.md
@@ -203,7 +203,7 @@ undercloud_update_packages: >-
   openstack-tripleo-heat-templates
   puppet-tripleo
   python-tripleoclient
-  python-heat-agent*
+  openstack-heat-agents
 ```
 
 Or use the ``undercloud_update_packages: "'*'"`` to update all packages
@@ -301,7 +301,7 @@ And an example playbook to call the role is:
       openstack-tripleo-heat-templates
       puppet-tripleo
       python-tripleoclient
-      python-heat-agent*
+      openstack-heat-agents
     undercloud_extra_args: >-
       -e {{overcloud_templates_path}}/environments/disable-telemetry.yaml
       -e {{overcloud_templates_path}}/environments/docker-minimal.yaml
diff --git a/roles/undercloud-deploy/templates/undercloud-deploy.sh.j2 b/roles/undercloud-deploy/templates/undercloud-deploy.sh.j2
index 3137e7c16..a9fc50089 100644
--- a/roles/undercloud-deploy/templates/undercloud-deploy.sh.j2
+++ b/roles/undercloud-deploy/templates/undercloud-deploy.sh.j2
@@ -54,17 +54,11 @@ sudo yum install -y \
     openstack-heat-api \
     openstack-heat-engine \
     openstack-heat-monolith \
-    python-heat-agent \
-    python-heat-agent-apply-config \
-    python-heat-agent-ansible \
-    python-heat-agent-hiera \
-    python-heat-agent-puppet \
-    python-heat-agent-docker-cmd \
-    python-heat-agent-json-file \
+    openstack-heat-agents \
     python-ipaddr \
     python-tripleoclient \
     openvswitch \
-    openstack-puppet-modules
+    puppet-tripleo
 
 ## * Start the required services.
 ## ::