openstack/openstack-ansible-os_sahara
Code Issues Proposed changes

Updated from OpenStack Ansible Tests

Browse Source 
Change-Id: I80901f60974e894b55c5e949e20e3b646062d54f
This commit is contained in:
OpenStack Proposal Bot 2017-08-08 13:30:17 +00:00
parent 9dedd0c049
commit 35e734f890
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Vagrantfile vendored
View File

@ -36,6 +36,10 @@ Vagrant.configure(2) do |config|
leap422.vm.box = "opensuse/openSUSE-42.2-x86_64" leap422.vm.box = "opensuse/openSUSE-42.2-x86_64"
end end
config.vm.define "opensuse423" do |leap423|
leap423.vm.box = "opensuse/openSUSE-42.3-x86_64"
end
config.vm.define "centos7" do |centos7| config.vm.define "centos7" do |centos7|
centos7.vm.box = "centos/7" centos7.vm.box = "centos/7"
end end

6
bindep.txt
View File

@ -30,6 +30,9 @@ libffi-dev [platform:dpkg]
python2.7 [platform:dpkg] python2.7 [platform:dpkg]
python-apt [platform:dpkg] python-apt [platform:dpkg]
python-dev [platform:dpkg] python-dev [platform:dpkg]
python3 [platform:dpkg]
python3-apt [platform:dpkg]
python3-dev [platform:dpkg]
# Base requirements for RPM distros # Base requirements for RPM distros
gcc [platform:rpm] gcc [platform:rpm]
@ -51,8 +54,7 @@ python-pyasn1 [platform:dpkg platform:suse]
python-openssl [platform:dpkg] python-openssl [platform:dpkg]
python-ndg-httpsclient [platform:ubuntu !platform:ubuntu-14] python-ndg-httpsclient [platform:ubuntu !platform:ubuntu-14]
python2-pyasn1 [platform:redhat] python2-pyasn1 [platform:redhat]
python2-pyOpenSSL [platform:redhat !platform:fedora] pyOpenSSL [platform:redhat]
pyOpenSSL [platform:fedora]
python-pyOpenSSL [platform:opensuseproject-42] python-pyOpenSSL [platform:opensuseproject-42]
python2-pyOpenSSL [platform:suse !platform:opensuseproject-42] python2-pyOpenSSL [platform:suse !platform:opensuseproject-42]
python-ndg_httpsclient [platform:redhat !platform:fedora] python-ndg_httpsclient [platform:redhat !platform:fedora]

5
run_tests.sh
View File

@ -35,9 +35,12 @@ source /etc/os-release || source /usr/lib/os-release
install_pkg_deps() { install_pkg_deps() {
pkg_deps="git" pkg_deps="git"
# Prefer dnf over yum for CentOS.
which dnf &>/dev/null && RHT_PKG_MGR='dnf' || RHT_PKG_MGR='yum'
case ${ID,,} in case ${ID,,} in
*suse*) pkg_mgr_cmd="zypper -n in" ;; *suse*) pkg_mgr_cmd="zypper -n in" ;;
centos|rhel) pkg_mgr_cmd="yum install -y" ;; centos|rhel) pkg_mgr_cmd="${RHT_PKG_MGR} install -y" ;;
fedora) pkg_mgr_cmd="dnf -y install" ;; fedora) pkg_mgr_cmd="dnf -y install" ;;
ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;; ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;;
*) echo "unsupported distribution: ${ID,,}"; exit 1 ;; *) echo "unsupported distribution: ${ID,,}"; exit 1 ;;