From 4b5691d3827f6d8936a40e5a368ec682add7cb94 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Fri, 19 Jun 2020 22:23:08 +0900
Subject: [PATCH] Install osc-placement package during client package
 installation

This patch makes osc-placmeent package installed as a part of client
packages, because this package is required to manage resources in
placement service.

Change-Id: Ib2524cf97f97693d7d03c1bb4fb1c2bde40d3bec
(cherry picked from commit 8f758e5e4ffc9cbca2b979f730da0fa2cd461057)
(cherry picked from commit 80e0bf2e1fa3ab91f58601b0f15d1852b490821c)
---
 .../tripleo-clients-install/defaults/main.yml | 37 ++++++++++---------
 .../molecule/default/playbook.yml             |  5 ++-
 .../tripleo-clients-install/tasks/main.yml    |  2 +-
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/tripleo_ansible/roles/tripleo-clients-install/defaults/main.yml b/tripleo_ansible/roles/tripleo-clients-install/defaults/main.yml
index 4604a4997..6f0e9a313 100644
--- a/tripleo_ansible/roles/tripleo-clients-install/defaults/main.yml
+++ b/tripleo_ansible/roles/tripleo-clients-install/defaults/main.yml
@@ -21,21 +21,22 @@
 tripleo_clients_install_pkg_state: present
 
 tripleo_clients_install_dict:
-  aodh: present
-  barbican: present
-  cinder: present
-  designate: present
-  glance: present
-  gnocchi: present
-  heat: present
-  ironic: present
-  keystone: present
-  manila: present
-  mistral: present
-  neutron: present
-  nova: present
-  openstack: present
-  panko: present
-  sahara: present
-  swift: present
-  zaqar: present
+  aodhclient: present
+  barbicanclient: present
+  cinderclient: present
+  designateclient: present
+  glanceclient: present
+  gnocchiclient: present
+  heatclient: present
+  ironicclient: present
+  keystoneclient: present
+  manilaclient: present
+  mistralclient: present
+  neutronclient: present
+  novaclient: present
+  openstackclient: present
+  osc-placement: present
+  pankoclient: present
+  saharaclient: present
+  swiftclient: present
+  zaqarclient: present
diff --git a/tripleo_ansible/roles/tripleo-clients-install/molecule/default/playbook.yml b/tripleo_ansible/roles/tripleo-clients-install/molecule/default/playbook.yml
index 7654a19b7..0bf9e8bf8 100644
--- a/tripleo_ansible/roles/tripleo-clients-install/molecule/default/playbook.yml
+++ b/tripleo_ansible/roles/tripleo-clients-install/molecule/default/playbook.yml
@@ -19,7 +19,8 @@
   hosts: all
   vars:
     tripleo_clients_install_dict:
-      aodh: installed
-      barbican: installed
+      aodhclient: installed
+      barbicanclient: installed
+      osc-placement: installed
   roles:
     - role: "tripleo-clients-install"
diff --git a/tripleo_ansible/roles/tripleo-clients-install/tasks/main.yml b/tripleo_ansible/roles/tripleo-clients-install/tasks/main.yml
index cbe38f241..0491650a1 100644
--- a/tripleo_ansible/roles/tripleo-clients-install/tasks/main.yml
+++ b/tripleo_ansible/roles/tripleo-clients-install/tasks/main.yml
@@ -41,7 +41,7 @@
          }
       %}
       {% for k, v in tripleo_clients_install_dict.items() %}
-      {%   set pkg_name = tripleo_clients_install_python_prefix ~ '-' ~ k ~ 'client' %}
+      {%   set pkg_name = tripleo_clients_install_python_prefix ~ '-' ~ k %}
       {%   if (tripleo_clients_install_pkg_state == 'present') and (v != tripleo_clients_install_pkg_state) %}
       {%     set _ = package_sets[v].append(pkg_name) %}
       {%   else %}