From c2654c826b4aacd36ef22594c10010b6d908b75c Mon Sep 17 00:00:00 2001
From: jkilpatr <jkilpatr@redhat.com>
Date: Sun, 4 Jun 2017 09:22:14 -0400
Subject: [PATCH] Fix some errors that slipped by the linters

So up until recently the 'linters' CI run ran both
the pep8 and the Ansible linters, after some review
I can only conclude that it actually was not supposed
to do that and I should have seperate Python and Ansible
linters jobs.

Anyways because of this the pep linters where out for a
few days an we got exactly two minor pep errors into our
repo.

Change-Id: I66f82021c71f89a775e05c411ee1af2dba3a1c7b
---
 bindep.txt                                                  | 2 ++
 .../nova-create-pbench-uperf/nova-create-pbench-uperf.py    | 6 ++----
 test-requirements.txt                                       | 1 +
 tox.ini                                                     | 1 -
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bindep.txt b/bindep.txt
index 5c170cb9f..4631c8d5c 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -2,5 +2,7 @@
 # see http://docs.openstack.org/infra/bindep/ for additional information.
 libffi-dev [platform:dpkg]
 libffi-devel [platform:rpm]
+libssl-dev [platform:dpkg]
+openssl-devel [platform:rpm]
 virtual/libffi [platform:gentoo]
 
diff --git a/rally/rally-plugins/nova-create-pbench-uperf/nova-create-pbench-uperf.py b/rally/rally-plugins/nova-create-pbench-uperf/nova-create-pbench-uperf.py
index af7998d85..0eb0e53ba 100644
--- a/rally/rally-plugins/nova-create-pbench-uperf/nova-create-pbench-uperf.py
+++ b/rally/rally-plugins/nova-create-pbench-uperf/nova-create-pbench-uperf.py
@@ -175,12 +175,10 @@ class BrowbeatPlugin(neutron_utils.NeutronScenario,
             test_name)
 
         if message_sizes is not None :
-            uperf += " --message-sizes={}".format(
-            message_sizes)
+            uperf += " --message-sizes={}".format(message_sizes)
 
         if instances is not None:
-            uperf += " --instances={}".format(
-            instances)
+            uperf += " --instances={}".format(instances)
 
         # Execute pbench-uperf
         # execute returns, exitcode,stdout,stderr
diff --git a/test-requirements.txt b/test-requirements.txt
index 0b58bb3c2..ae9399dcf 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,6 +5,7 @@
 hacking<0.11,>=0.10.0
 
 ansible-lint
+pykwalify
 coverage>=3.6
 python-subunit>=0.0.18
 sphinx>=1.3,!=1.6.1
diff --git a/tox.ini b/tox.ini
index 781580995..1641aeec4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,6 @@ commands = python setup.py test
 [testenv:linters]
 whitelist_externals = bash
 commands =
-  pip install pykwalify
   bash -c "cd ansible; find . -type f -regex '.*.y[a]?ml' -print0 | xargs -t -n1 -0 \
     ansible-lint \
     -x ANSIBLE0013,ANSIBLE0012,ANSIBLE0006,ANSIBLE0007,ANSIBLE0010,ANSIBLE0016"