test: use ansible 2.9 and python3
This commit is contained in:
parent
d7dff8d9f2
commit
b756a7ea4f
2 changed files with 6 additions and 6 deletions
|
@ -15,13 +15,13 @@ provisioner:
|
||||||
ansible_inventory: ./test/integration/inventory
|
ansible_inventory: ./test/integration/inventory
|
||||||
|
|
||||||
platforms:
|
platforms:
|
||||||
- name: debian-9
|
- name: debian-10
|
||||||
driver_config:
|
driver_config:
|
||||||
image: "nishiki/debian9:ansible-<%= ENV['ANSIBLE_VERSION'] ? ENV['ANSIBLE_VERSION'] : '2.7' %>"
|
image: "nishiki/debian10: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
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# {{ ansible_managed }}
|
# {{ ansible_managed }}
|
||||||
|
|
||||||
{% for option, value in cerebro_full_config.iteritems() %}
|
{% for option, value in cerebro_full_config.items() %}
|
||||||
{{ option }} = {{ value }}
|
{{ option }} = {{ value }}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% if cerebro_auth_type in ['basic', 'ldap'] %}
|
{% if cerebro_auth_type in ['basic', 'ldap'] %}
|
||||||
|
@ -12,7 +12,7 @@ auth = {
|
||||||
password = {{ cerebro_auth_password }}
|
password = {{ cerebro_auth_password }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
settings {
|
settings {
|
||||||
{% for option, value in cerebro_auth_settings.iteritems() %}
|
{% for option, value in cerebro_auth_settings.items() %}
|
||||||
{{ option }} = {{ value }}
|
{{ option }} = {{ value }}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,7 @@ hosts = [
|
||||||
}
|
}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if 'options' in host %}
|
{% if 'options' in host %}
|
||||||
{% for option, value in host.options.iteritems() %}
|
{% for option, value in host.options.items() %}
|
||||||
{{ option }} = {{ value }}
|
{{ option }} = {{ value }}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
Loading…
Reference in a new issue