From 6a985b9c6b6d2e867159d348d3b769488f490d4a Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Thu, 30 Apr 2015 16:16:27 -0700 Subject: [PATCH] Add Fedora mysql vars so we get mariadb rather than mariadb-galera --- test/integration/roles/setup_mysql_db/tasks/main.yml | 2 ++ test/integration/roles/setup_mysql_db/vars/Fedora.yml | 6 ++++++ 2 files changed, 8 insertions(+) create mode 100644 test/integration/roles/setup_mysql_db/vars/Fedora.yml diff --git a/test/integration/roles/setup_mysql_db/tasks/main.yml b/test/integration/roles/setup_mysql_db/tasks/main.yml index a36abeb6c2f..a8010e71389 100644 --- a/test/integration/roles/setup_mysql_db/tasks/main.yml +++ b/test/integration/roles/setup_mysql_db/tasks/main.yml @@ -20,7 +20,9 @@ - include_vars: '{{ item }}' with_first_found: - files: + - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml' - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml' + - '{{ ansible_distribution }}.yml' - '{{ ansible_os_family }}.yml' paths: '../vars' diff --git a/test/integration/roles/setup_mysql_db/vars/Fedora.yml b/test/integration/roles/setup_mysql_db/vars/Fedora.yml new file mode 100644 index 00000000000..f8b29fd7a16 --- /dev/null +++ b/test/integration/roles/setup_mysql_db/vars/Fedora.yml @@ -0,0 +1,6 @@ +mysql_service: 'mariadb' + +mysql_packages: + - mariadb-server + - MySQL-python + - bzip2