diff --git a/.kitchen.yml b/.kitchen.yml index 7efd83c..c30c24a 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -15,13 +15,13 @@ provisioner: ansible_inventory: ./test/integration/inventory platforms: - - name: debian-9 + - name: debian driver_config: - image: "nishiki/debian9:ansible-<%= ENV['ANSIBLE_VERSION'] ? ENV['ANSIBLE_VERSION'] : '2.8' %>" + image: "nishiki/debian<%= ENV['DEBIAN_VERSION'] ? ENV['DEBIAN_VERSION'] : '10' %>:ansible-<%= ENV['ANSIBLE_VERSION'] ? ENV['ANSIBLE_VERSION'] : '2.9' %>" command: /bin/systemd volume: - /sys/fs/cgroup:/sys/fs/cgroup:ro - security_opt: seccomp=unconfined + privileged: cap-add=SYS_ADMIN suites: - name: default diff --git a/.travis.yml b/.travis.yml index 1fc9885..44fb128 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,10 @@ sudo: required language: ruby env: - - ANSIBLE_VERSION=2.8 + - DEBIAN_VERSION=9 ANSIBLE_VERSION=2.8 + - DEBIAN_VERSION=9 ANSIBLE_VERSION=2.9 + - DEBIAN_VERSION=10 ANSIBLE_VERSION=2.8 + - DEBIAN_VERSION=10 ANSIBLE_VERSION=2.9 services: - docker diff --git a/README.md b/README.md index 6c3d71a..ad09d70 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,8 @@ Install and configure MariaDB ## Requirements -* Ansible >= 2.6 -* Debian Stretch +* Ansible >= 2.8 +* Debian Stretch and Buster ## Role variables diff --git a/meta/main.yml b/meta/main.yml index c6bcb3d..4a85abb 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -11,6 +11,7 @@ galaxy_info: - name: Debian versions: - stretch + - buster galaxy_tags: - database diff --git a/tasks/main.yml b/tasks/main.yml index c9fbd4c..de7435e 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -9,6 +9,7 @@ packages: - mariadb-server - python-mysqldb + - python3-mysqldb retries: 2 register: result until: result is succeeded diff --git a/templates/my.cnf.j2 b/templates/my.cnf.j2 index b4ae60d..cd32ef2 100644 --- a/templates/my.cnf.j2 +++ b/templates/my.cnf.j2 @@ -1,8 +1,8 @@ # {{ ansible_managed }} -{% for section, options in mariadb_full_config.iteritems() %} +{% for section, options in mariadb_full_config.items() %} [{{section}}] -{% for option, value in options.iteritems() %} +{% for option, value in options.items() %} {{ option }}{% if not value is sameas true %} = {{ value }}{% endif %} {% endfor %}