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. Moreover, we do not need to
fetch the httplib2 module from PIP since it's provided by distribution
repositories.

Implements: blueprint openstack-distribution-packages
Change-Id: Ic40f0ac06ba63bc601dc0bc1cf3fafb87c88269f

vars/redhat-7.yml

@@ -36,9 +36,13 @@ neutron_distro_packages:
   - iputils
   - keepalived
   - net-tools
+  - python-keystoneclient
   - radvd
   - which
 
+neutron_devel_distro_packages:
+  - python-httplib2
+
 neutron_service_distro_packages:
   - python-cliff
   - python-keystonemiddleware
@@ -47,7 +51,6 @@ neutron_service_distro_packages:
   - openstack-neutron-macvtap-agent
   - openstack-neutron-l2gw-agent
   - python-glanceclient
-  - python-keystoneclient
   - python-memcached
   - python-neutronclient
   - python-novaclient

vars/source_install.yml

@@ -43,12 +43,11 @@ neutron_package_list: |-
   {% if neutron_developer_mode | bool %}
   {%   set _ = packages.extend(neutron_developer_mode_distro_packages) %}
   {% endif %}
+  {% set _ = packages.extend(neutron_devel_distro_packages) %}
   {{ packages }}
 
 neutron_requires_pip_packages:
   - virtualenv
-  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
-  - httplib2
 
 neutron_pip_packages:
   - cliff

vars/suse-42.yml

@@ -47,9 +47,13 @@ neutron_distro_packages:
   - iputils
   - keepalived
   - net-tools
+  - python-keystoneclient
   - radvd
   - which
 
+neutron_devel_distro_packages:
+  - python-httplib2
+
 neutron_service_distro_packages:
   - python-cliff
   - python-keystonemiddleware
@@ -57,7 +61,6 @@ neutron_service_distro_packages:
   - openstack-neutron-server
   - openstack-neutron-dhcp-agent
   - python-glanceclient
-  - python-keystoneclient
   - python-memcached
   - python-neutronclient
   - python-novaclient

vars/ubuntu-16.04.yml

@@ -45,8 +45,12 @@ neutron_distro_packages:
   - iputils-arping
   - net-tools
   - keepalived
+  - python-keystoneclient
   - radvd
 
+neutron_devel_distro_packages:
+  - python-httplib2
+
 neutron_service_distro_packages:
   - python-cliff
   - python-keystonemiddleware
@@ -58,7 +62,6 @@ neutron_service_distro_packages:
   - neutron-metadata-agent
   - neutron-plugin-ml2
   - python-glanceclient
-  - python-keystoneclient
   - python-memcache
   - python-neutronclient
   - python-novaclient