Updated from OpenStack Ansible Tests
Change-Id: I61aac084c76c3deb7c8aa3b59021bbdd96801917
This commit is contained in:
parent
948374ddf0
commit
c2f9675e0f
|
@ -31,8 +31,8 @@ Vagrant.configure(2) do |config|
|
||||||
./run_tests.sh
|
./run_tests.sh
|
||||||
SHELL
|
SHELL
|
||||||
|
|
||||||
config.vm.define "centos7" do |centos7|
|
config.vm.define "centos8" do |centos8|
|
||||||
centos7.vm.box = "centos/7"
|
centos8.vm.box = "centos/8"
|
||||||
end
|
end
|
||||||
|
|
||||||
config.vm.define "debian8" do |debian8|
|
config.vm.define "debian8" do |debian8|
|
||||||
|
|
|
@ -51,13 +51,10 @@ fi
|
||||||
# Source distribution information
|
# Source distribution information
|
||||||
source /etc/os-release || source /usr/lib/os-release
|
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
|
# Figure out the appropriate package install command
|
||||||
case ${ID,,} in
|
case ${ID,,} in
|
||||||
*suse*) pkg_mgr_cmd="zypper -n 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" ;;
|
ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;;
|
||||||
# Gentoo needs to have version set since it's rolling
|
# Gentoo needs to have version set since it's rolling
|
||||||
gentoo) pkg_mgr_cmd="emerge --jobs=4"; VERSION="rolling" ;;
|
gentoo) pkg_mgr_cmd="emerge --jobs=4"; VERSION="rolling" ;;
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
- common-mariadb
|
- common-mariadb
|
||||||
block:
|
block:
|
||||||
- name: Create database for service
|
- name: Create database for service
|
||||||
mysql_db:
|
community.mysql.mysql_db:
|
||||||
name: "{{ item.name }}"
|
name: "{{ item.name }}"
|
||||||
login_host: "{{ _oslodb_setup_endpoint | default(omit) }}"
|
login_host: "{{ _oslodb_setup_endpoint | default(omit) }}"
|
||||||
login_port: "{{ _oslodb_setup_port | default(omit) }}"
|
login_port: "{{ _oslodb_setup_port | default(omit) }}"
|
||||||
|
@ -36,7 +36,7 @@
|
||||||
no_log: true
|
no_log: true
|
||||||
|
|
||||||
- name: Grant access to the database for the service
|
- name: Grant access to the database for the service
|
||||||
mysql_user:
|
community.mysql.mysql_user:
|
||||||
name: "{{ item.1.username }}"
|
name: "{{ item.1.username }}"
|
||||||
password: "{{ item.1.password }}"
|
password: "{{ item.1.password }}"
|
||||||
host: "{{ item.1.host | default('%') }}"
|
host: "{{ item.1.host | default('%') }}"
|
||||||
|
|
Loading…
Reference in New Issue