Merge "Use bindep to specify binary dependencies"

2019-01-07 16:54:25 +00:00 · 2019-01-07 16:54:25 +00:00 · cd747e50df
commit cd747e50df
parent 3815e94721 956eb44277
3 changed files with 15 additions and 1 deletions
--- a/bindep.txt
+++ b/bindep.txt
@ -0,0 +1,14 @@
+# This file contains runtime (non-python) dependencies
+# More info at: http://docs.openstack.org/infra/bindep/readme.html
+
+# install Ansible as system package
+ansible
+
+# cffi (required by oslo.privsep) and PyNaCL (required by paramiko)
+libffi-dev [platform:dpkg]
+libffi-devel [platform:rpm]
+
+# requirements from paramiko which requires cryptography which requires ssl
+libssl-dev [platform:dpkg]
+openssl-devel [platform:rpm !platform:suse]
+libopenssl-devel [platform:suse !platform:rpm]
--- a/os_faults/tests/devstack/playbooks/pre.yml
+++ b/os_faults/tests/devstack/playbooks/pre.yml
@ -2,4 +2,5 @@

 - hosts: all
  roles:
+    - bindep
    - orchestrate-devstack
--- a/tox.ini
+++ b/tox.ini
@ -65,7 +65,6 @@ setenv = {[testenv]setenv}
         OS_TEST_PATH=./os_faults/tests/devstack
         OS_DEBUG=True
 deps = {[testenv]deps}
-       ansible
 extras =
 commands =
  py.test -vvvv --html={envlogdir}/pytest_results.html --self-contained-html --durations=10 "os_faults/tests/devstack" {posargs}