commit 49f435a7aaca028c94427136ef54732424f9a83a Author: OpenStack Proposal Bot Date: Thu Oct 1 18:20:47 2020 +0000 Updated from OpenStack Ansible Tests Change-Id: I6eeaa3e623da62c78d1984c7c400242b233f27d6 diff --git a/Vagrantfile b/Vagrantfile index bf2400c..7691c3c 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -31,8 +31,8 @@ Vagrant.configure(2) do |config| ./run_tests.sh SHELL - config.vm.define "centos7" do |centos7| - centos7.vm.box = "centos/7" + config.vm.define "centos8" do |centos8| + centos8.vm.box = "centos/8" end config.vm.define "debian8" do |debian8| diff --git a/run_tests.sh b/run_tests.sh index 3129599..93e91dd 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -51,13 +51,10 @@ fi # Source distribution information source /etc/os-release || source /usr/lib/os-release -# Prefer dnf over yum for CentOS. -which dnf &>/dev/null && RHT_PKG_MGR='dnf' || RHT_PKG_MGR='yum' - # Figure out the appropriate package install command case ${ID,,} in *suse*) pkg_mgr_cmd="zypper -n in" ;; - centos|rhel|fedora) pkg_mgr_cmd="${RHT_PKG_MGR} install -y" ;; + centos|rhel|fedora) pkg_mgr_cmd="dnf install -y" ;; ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;; # Gentoo needs to have version set since it's rolling gentoo) pkg_mgr_cmd="emerge --jobs=4"; VERSION="rolling" ;; diff --git a/tasks/db_setup.yml b/tasks/db_setup.yml index aca206e..09b01f8 100644 --- a/tasks/db_setup.yml +++ b/tasks/db_setup.yml @@ -28,7 +28,7 @@ - common-mariadb block: - name: Create database for service - mysql_db: + community.mysql.mysql_db: name: "{{ item.name }}" login_host: "{{ _oslodb_setup_endpoint | default(omit) }}" login_port: "{{ _oslodb_setup_port | default(omit) }}" @@ -36,7 +36,7 @@ no_log: true - name: Grant access to the database for the service - mysql_user: + community.mysql.mysql_user: name: "{{ item.1.username }}" password: "{{ item.1.password }}" host: "{{ item.1.host | default('%') }}"