From 793daaef3ea78881dc1cb8cfc9d8ed9d5eb48e7e Mon Sep 17 00:00:00 2001
From: Hemanth Nakkina <hemanth.nakkina@canonical.com>
Date: Fri, 27 Mar 2020 10:46:20 +0530
Subject: [PATCH] Fix zuul/CI failures

Zuul check openstack-tox-py35 fails with the following error
ERROR: Package 'python-heatclient' requires a different
Python: 3.5.2 not in '>=3.6'

openstack client packages in test-requirements are only
required for func-smoke tests. Also func-smoke tests are
executed on python 2.7 environment. So the fix pins the
exact versions of openstack client packages for python 2.7.

Keystone config parameter admin-token is removed from latest
keystone charm. Remove the param from the bundle generator.

Change-Id: I657e221c43ec9807fb1886089d7068727ffb9ed9
---
 test-requirements.txt     | 18 +++++++++---------
 tests/basic_deployment.py |  3 +--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index bb2e3a72..79843df0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,15 +11,15 @@ requests>=2.18.4
 # Liberty client lower constraints
 amulet>=1.14.3,<2.0;python_version=='2.7'
 bundletester>=0.6.1,<1.0;python_version=='2.7'
-python-ceilometerclient>=1.5.0
-python-cinderclient>=1.4.0,<5.0.0
-python-glanceclient>=1.1.0
-python-heatclient>=0.8.0
-python-keystoneclient>=1.7.1
-python-neutronclient>=3.1.0
-python-novaclient>=2.30.1
-python-openstackclient>=1.7.0
-python-swiftclient>=2.6.0
+python-ceilometerclient==2.9.0;python_version=='2.7'
+python-cinderclient==4.3.0;python_version=='2.7'
+python-glanceclient==2.17.0;python_version=='2.7'
+python-heatclient==1.18.0;python_version=='2.7'
+python-keystoneclient==3.22.0;python_version=='2.7'
+python-neutronclient==6.14.0;python_version=='2.7'
+python-novaclient==16.0.0;python_version=='2.7'
+python-openstackclient==4.0.0;python_version=='2.7'
+python-swiftclient==3.8.1;python_version=='2.7'
 pika>=0.10.0,<1.0
 distro-info
 git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 4523d92e..54981376 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -189,8 +189,7 @@ class NovaCCBasicDeployment(OpenStackAmuletDeployment):
         if self._get_openstack_release() >= self.xenial_ocata:
             nova_cc_config['network-manager'] = 'Neutron'
 
-        keystone_config = {'admin-password': 'openstack',
-                           'admin-token': 'ubuntutesting'}
+        keystone_config = {'admin-password': 'openstack'}
 
         pxc_config = {
             'dataset-size': '25%',