From 02b785f698cde746849df3778a6e1b2ea7bbce7a Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Thu, 6 Jul 2017 21:08:31 +0000 Subject: [PATCH] Updated from OpenStack Ansible Tests Change-Id: I2d1b3b93901a5fb575b38da64d07f4a1af4fde5a --- bindep.txt | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/bindep.txt b/bindep.txt index dfe61db1..f2924a2a 100644 --- a/bindep.txt +++ b/bindep.txt @@ -28,15 +28,19 @@ git-core [platform:dpkg] libssl-dev [platform:dpkg] libffi-dev [platform:dpkg] python2.7 [platform:dpkg] +python-apt [platform:dpkg] python-dev [platform:dpkg] # Base requirements for RPM distros gcc [platform:rpm] gcc-c++ [platform:rpm] git [platform:rpm] -libffi-devel [platform:rpm] -openssl-devel [platform:rpm] +libffi-devel [platform:rpm !platform:opensuseproject-42] +libffi-devel-gcc5 [platform:opensuseproject-42] +openssl-devel [platform:redhat] +libopenssl-devel [platform:suse] python-devel [platform:rpm] +python2-dnf [platform:fedora] # For SELinux libselinux-python [platform:redhat] @@ -44,12 +48,15 @@ libsemanage-python [platform:redhat] # For SSL SNI support python-pyasn1 [platform:dpkg platform:suse] -python-openssl [platform:dpkg platform:suse] -python-ndg-httpsclient [platform:ubuntu] +python-openssl [platform:dpkg] +python-ndg-httpsclient [platform:ubuntu !platform:ubuntu-14] python2-pyasn1 [platform:redhat] -python2-pyOpenSSL [platform:redhat] -python-pyOpenSSL [platform:suse] -python-ndg_httpsclient [platform:redhat] +python2-pyOpenSSL [platform:redhat !platform:fedora] +pyOpenSSL [platform:fedora] +python-pyOpenSSL [platform:opensuseproject-42] +python2-pyOpenSSL [platform:suse !platform:opensuseproject-42] +python-ndg_httpsclient [platform:redhat !platform:fedora] +python2-ndg_httpsclient [platform:fedora] python-ndg-httpsclient [platform:suse] # Required for compressing collected log files in CI