From b7c747635995f7c108849c495c6fda3059738bce Mon Sep 17 00:00:00 2001 From: James Laska Date: Wed, 10 Sep 2014 16:32:28 -0400 Subject: [PATCH] Include el7 mariadb support in mysql integration test --- .../integration/roles/setup_mysql_db/tasks/main.yml | 13 +++++++++---- .../roles/setup_mysql_db/vars/RedHat-7.yml | 6 ++++++ 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 test/integration/roles/setup_mysql_db/vars/RedHat-7.yml diff --git a/test/integration/roles/setup_mysql_db/tasks/main.yml b/test/integration/roles/setup_mysql_db/tasks/main.yml index 7f909e40b6..0b15d14104 100644 --- a/test/integration/roles/setup_mysql_db/tasks/main.yml +++ b/test/integration/roles/setup_mysql_db/tasks/main.yml @@ -17,15 +17,20 @@ # along with Ansible. If not, see . # ============================================================ -- include_vars: '{{ ansible_os_family }}.yml' +- include_vars: '{{ item }}' + with_first_found: + - files: + - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml' + - '{{ ansible_os_family }}.yml' + paths: '../vars' - name: install mysqldb_test rpm dependencies - yum: name={{ item }} state=latest + yum: name={{ item }} state=latest with_items: mysql_packages when: ansible_pkg_mgr == 'yum' -- name: install mysqldb_test debian dependencies - apt: name={{ item }} state=latest +- name: install mysqldb_test debian dependencies + apt: name={{ item }} state=latest with_items: mysql_packages when: ansible_pkg_mgr == 'apt' diff --git a/test/integration/roles/setup_mysql_db/vars/RedHat-7.yml b/test/integration/roles/setup_mysql_db/vars/RedHat-7.yml new file mode 100644 index 0000000000..f8b29fd7a1 --- /dev/null +++ b/test/integration/roles/setup_mysql_db/vars/RedHat-7.yml @@ -0,0 +1,6 @@ +mysql_service: 'mariadb' + +mysql_packages: + - mariadb-server + - MySQL-python + - bzip2