feat: add support debian 10 and ansible 2.9
This commit is contained in:
parent
59b557c6e7
commit
e947d74e13
6 changed files with 13 additions and 8 deletions
|
@ -15,13 +15,13 @@ provisioner:
|
||||||
ansible_inventory: ./test/integration/inventory
|
ansible_inventory: ./test/integration/inventory
|
||||||
|
|
||||||
platforms:
|
platforms:
|
||||||
- name: debian-9
|
- name: debian
|
||||||
driver_config:
|
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
|
command: /bin/systemd
|
||||||
volume:
|
volume:
|
||||||
- /sys/fs/cgroup:/sys/fs/cgroup:ro
|
- /sys/fs/cgroup:/sys/fs/cgroup:ro
|
||||||
security_opt: seccomp=unconfined
|
privileged: cap-add=SYS_ADMIN
|
||||||
|
|
||||||
suites:
|
suites:
|
||||||
- name: default
|
- name: default
|
||||||
|
|
|
@ -3,7 +3,10 @@ sudo: required
|
||||||
language: ruby
|
language: ruby
|
||||||
|
|
||||||
env:
|
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:
|
services:
|
||||||
- docker
|
- docker
|
||||||
|
|
|
@ -8,8 +8,8 @@ Install and configure MariaDB
|
||||||
|
|
||||||
## Requirements
|
## Requirements
|
||||||
|
|
||||||
* Ansible >= 2.6
|
* Ansible >= 2.8
|
||||||
* Debian Stretch
|
* Debian Stretch and Buster
|
||||||
|
|
||||||
## Role variables
|
## Role variables
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,7 @@ galaxy_info:
|
||||||
- name: Debian
|
- name: Debian
|
||||||
versions:
|
versions:
|
||||||
- stretch
|
- stretch
|
||||||
|
- buster
|
||||||
|
|
||||||
galaxy_tags:
|
galaxy_tags:
|
||||||
- database
|
- database
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
packages:
|
packages:
|
||||||
- mariadb-server
|
- mariadb-server
|
||||||
- python-mysqldb
|
- python-mysqldb
|
||||||
|
- python3-mysqldb
|
||||||
retries: 2
|
retries: 2
|
||||||
register: result
|
register: result
|
||||||
until: result is succeeded
|
until: result is succeeded
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# {{ ansible_managed }}
|
# {{ ansible_managed }}
|
||||||
|
|
||||||
{% for section, options in mariadb_full_config.iteritems() %}
|
{% for section, options in mariadb_full_config.items() %}
|
||||||
[{{section}}]
|
[{{section}}]
|
||||||
{% for option, value in options.iteritems() %}
|
{% for option, value in options.items() %}
|
||||||
{{ option }}{% if not value is sameas true %} = {{ value }}{% endif %}
|
{{ option }}{% if not value is sameas true %} = {{ value }}{% endif %}
|
||||||
|
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
Loading…
Reference in a new issue