Merge "Do not pip install keystoneclient on the host"

2018-05-10 20:49:12 +00:00
parent 02f8895c16 987c78c9c4
commit 9fc96b16e7
4 changed files with 3 additions and 1 deletions
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -412,7 +412,6 @@ keystone_ceilometer_enabled: false
 # Keystone packages that must be installed before anything else
 keystone_requires_pip_packages:
  - virtualenv
-  - python-keystoneclient # Keystoneclient needed to OSA keystone lib

 # Common pip packages
 keystone_pip_packages:
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -26,6 +26,7 @@ keystone_distro_packages:
  - openldap-devel
  - openssl
  - python-devel
+  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
  - rsync
  - which

--- a/vars/suse-42.yml
+++ b/vars/suse-42.yml
@@ -26,6 +26,7 @@ keystone_distro_packages:
  - openldap2-devel
  - openssl
  - python-devel
+  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
  - rsync
  - which

--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -25,6 +25,7 @@ keystone_distro_packages:
  - libxslt1-dev
  - libxml2-dev
  - python-dev
+  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
  - rsync

 keystone_apache_distro_packages: