From b95d78df81f07ca16cbf685af8ffbc54b353ff89 Mon Sep 17 00:00:00 2001
From: "Chandan Kumar (raukadah)" <chkumar@redhat.com>
Date: Tue, 3 Mar 2020 12:30:05 +0530
Subject: [PATCH] Fixed package names for CentOS-8 octavia deployment

Conflicts:
    deployment/octavia/octavia-worker-container-puppet.yaml

Change-Id: I9501b802c0a79996864761f2f0ef92df4a3d7c70
Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com>
(cherry picked from commit 0e80f600ac1b071ce1eba132a02be9fc7f79d711)
---
 .../octavia-worker-container-puppet.yaml      | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/deployment/octavia/octavia-worker-container-puppet.yaml b/deployment/octavia/octavia-worker-container-puppet.yaml
index 93ff5661a8..e840baed88 100644
--- a/deployment/octavia/octavia-worker-container-puppet.yaml
+++ b/deployment/octavia/octavia-worker-container-puppet.yaml
@@ -142,13 +142,24 @@ outputs:
             setype: "{{ item.setype }}"
           with_items:
             - { 'path': /var/log/containers/octavia, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
-        - name: Ensure packages required for configuring octavia are present
-          package:
-            name:
-              - python2-neutronclient
-              - python2-openstackclient
-              - openssl
-            state: present
+        - block:
+            - name: Ensure packages required for configuring octavia are present for CentOS 7
+              package:
+                name:
+                  - python2-neutronclient
+                  - python2-openstackclient
+                  - openssl
+                state: present
+              when: ansible_distribution_major_version is version(8, '<')
+
+            - name: Ensure packages required for configuring octavia are present for CentOS/RHEL 8
+              package:
+                name:
+                  - python3-neutronclient
+                  - python3-openstackclient
+                  - openssl
+                state: present
+              when: ansible_distribution_major_version is version(8, '>=')
           when: {get_param: EnablePackageInstall}
         - name: enable virt_sandbox_use_netlink for healthcheck
           seboolean: