From 4bf5de8d30824bd16286874ea8ac1465802374f7 Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Thu, 31 May 2018 09:26:11 +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: Id5d79db00e1a4aa4983aafd92c088ef8f13a7da0
Implements: blueprint openstack-distribution-packages
---
 defaults/main.yml | 1 -
 vars/debian.yml   | 1 +
 vars/redhat-7.yml | 1 +
 vars/suse-42.yml  | 1 +
 4 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 8021b04a..84bc4c2b 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -319,7 +319,6 @@ swift_do_sync: True
 # swift packages that must be installed before anything else
 swift_requires_pip_packages:
   - virtualenv
-  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
   - httplib2
 
 swift_pip_packages:
diff --git a/vars/debian.yml b/vars/debian.yml
index 9b8fea31..92aa67ca 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -23,6 +23,7 @@ swift_distro_packages:
   - liberasurecode-dev
   - libffi-dev
   - openssh-server
+  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
   - python-dev
   - rsync
   - libssl-dev
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index c64c2298..7e06d81c 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -23,6 +23,7 @@ swift_distro_packages:
   - libselinux
   - libselinux-devel
   - openssh-server
+  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
   - python-devel
   - rsync
   - openssl-devel
diff --git a/vars/suse-42.yml b/vars/suse-42.yml
index d716d71b..8933d550 100644
--- a/vars/suse-42.yml
+++ b/vars/suse-42.yml
@@ -22,6 +22,7 @@ swift_distro_packages:
   - liberasurecode-devel
   - libffi-devel
   - openssh
+  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
   - python-devel
   - rsync
   - libopenssl-devel