From b756a7ea4fceed01d8a9cf1a2008fe3383735ba9 Mon Sep 17 00:00:00 2001 From: Adrien Waksberg Date: Wed, 12 Feb 2020 21:38:41 +0100 Subject: [PATCH] test: use ansible 2.9 and python3 --- .kitchen.yml | 6 +++--- templates/cerebro.conf.j2 | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index 7a16e14..3cdce5f 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -15,13 +15,13 @@ provisioner: ansible_inventory: ./test/integration/inventory platforms: - - name: debian-9 + - name: debian-10 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 volume: - /sys/fs/cgroup:/sys/fs/cgroup:ro - security_opt: seccomp=unconfined + privileged: cap-add=SYS_ADMIN suites: - name: default diff --git a/templates/cerebro.conf.j2 b/templates/cerebro.conf.j2 index 543bfd7..1f3516d 100644 --- a/templates/cerebro.conf.j2 +++ b/templates/cerebro.conf.j2 @@ -1,6 +1,6 @@ # {{ ansible_managed }} -{% for option, value in cerebro_full_config.iteritems() %} +{% for option, value in cerebro_full_config.items() %} {{ option }} = {{ value }} {% endfor %} {% if cerebro_auth_type in ['basic', 'ldap'] %} @@ -12,7 +12,7 @@ auth = { password = {{ cerebro_auth_password }} {% endif %} settings { -{% for option, value in cerebro_auth_settings.iteritems() %} +{% for option, value in cerebro_auth_settings.items() %} {{ option }} = {{ value }} {% endfor %} } @@ -31,7 +31,7 @@ hosts = [ } {% endif %} {% if 'options' in host %} -{% for option, value in host.options.iteritems() %} +{% for option, value in host.options.items() %} {{ option }} = {{ value }} {% endfor %} {% endif %}