From ba05bf78a0b4fcc5a99455a7cf7435dae51cad96 Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Thu, 31 May 2018 08:36:53 +0100
Subject: [PATCH] Do not pip install keystoneclient on the host

The keystoneclient package is being installed on the host by PIP but
that means that a whole bunch of required dependencies are being pulled
in as well.

This brings the host to a rather messed up state when installing
keystone from distro packages, since distribution and
PIP packages are being mixed together. We only need the client to
register the service with keystone so we can simply use the distro
package for that to avoid installing lots of PIP packages on the
host.

Change-Id: I1247ae07035451087e70f3e1782dd9c25fe1c554
Implements: blueprint openstack-distribution-packages
---
 defaults/main.yml     | 1 -
 vars/redhat-7.yml     | 1 +
 vars/suse-42.yml      | 1 +
 vars/ubuntu-16.04.yml | 1 +
 4 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index b259c433..478941cf 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -126,7 +126,6 @@ ceilometer_keystone_auth_type: password
 # ceilometer packages that must be installed before anything else
 ceilometer_requires_pip_packages:
   - httplib2
-  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
   - virtualenv
 
 # Common pip packages
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index 280b1ff8..70526ccf 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -15,6 +15,7 @@
 
 ceilometer_distro_packages:
   - git
+  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
   - rpcbind
   - rsync
   - which
diff --git a/vars/suse-42.yml b/vars/suse-42.yml
index b4464a34..f36a8e0b 100644
--- a/vars/suse-42.yml
+++ b/vars/suse-42.yml
@@ -16,6 +16,7 @@
 
 ceilometer_distro_packages:
   - git-core
+  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
   - rpcbind
   - rsync
   - which
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index 5aab387b..563e96c2 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -19,6 +19,7 @@ cache_timeout: 600
 # Common apt packages
 ceilometer_distro_packages:
   - git
+  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
   - rpcbind
   - rsync