From b58449d9de8a2dfe0f723045c7c5f9bac368191e Mon Sep 17 00:00:00 2001 From: licode Date: Fri, 11 Jan 2019 12:00:55 -0500 Subject: [PATCH 1/5] iteritems not working for dict in py3 --- templates/etc/defaults/kafka.j2 | 2 +- templates/usr/local/kafka/config/server.properties.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/etc/defaults/kafka.j2 b/templates/etc/defaults/kafka.j2 index 190f2f4..71f2519 100644 --- a/templates/etc/defaults/kafka.j2 +++ b/templates/etc/defaults/kafka.j2 @@ -1,6 +1,6 @@ KAFKA_HEAP_OPTS='{{ kafka_heap_opts }}' LOG_DIR='{{ kafka_log_dir }}' -{% for key, value in kafka_environment.iteritems() %} +{% for key, value in kafka_environment.items() %} {{key}}={{value}} {% endfor %} diff --git a/templates/usr/local/kafka/config/server.properties.j2 b/templates/usr/local/kafka/config/server.properties.j2 index fb3f861..b77bfe2 100644 --- a/templates/usr/local/kafka/config/server.properties.j2 +++ b/templates/usr/local/kafka/config/server.properties.j2 @@ -517,6 +517,6 @@ offsets.commit.timeout.ms={{ kafka_server.offsets_commit_timeout_ms }} {% endif %} -{% for key, value in kafka_server.misc.iteritems() -%} +{% for key, value in kafka_server.misc.items() -%} {{key}}={{value}} {% endfor -%} From f02ac538e2dd053d94eb33dfce8d16f6eb005f65 Mon Sep 17 00:00:00 2001 From: licode Date: Fri, 11 Jan 2019 13:13:37 -0500 Subject: [PATCH 2/5] update kafka version, the old one can't be found. --- defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 785476c..8d3641c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -6,7 +6,7 @@ kafka_zookeeper_port: 2181 kafka_hosts: # <-- must be overridden further up the chain # e.g. [ 'srvr1', 'srvr2' ] -kafka_version: "0.11.0.2" +kafka_version: "1.0.2" kafka_scala_version: "2.11" # NB: 2.11 is recommended at https://kafka.apache.org/downloads.html. From 451207d2c6e178ebad44a3e2ad88297f9bb78d18 Mon Sep 17 00:00:00 2001 From: licode Date: Fri, 11 Jan 2019 13:25:18 -0500 Subject: [PATCH 3/5] TST: update kafka version in travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ec5a0d7..8c0bb3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,10 +8,10 @@ python: 2.7 env: matrix: - - ANSIBLE_VERSION=2.2.3.0 ANSIBLE_EXTRA_VARS="kafka_version=0.11.0.2" - ANSIBLE_VERSION=2.2.3.0 ANSIBLE_EXTRA_VARS="kafka_version=1.0.1 kafka_generate_broker_id=false" - - ANSIBLE_VERSION=2.4.2.0 ANSIBLE_EXTRA_VARS="kafka_version=0.11.0.2" + - ANSIBLE_VERSION=2.2.3.0 ANSIBLE_EXTRA_VARS="kafka_version=1.0.2" - ANSIBLE_VERSION=2.4.2.0 ANSIBLE_EXTRA_VARS="kafka_version=1.0.1" + - ANSIBLE_VERSION=2.4.2.0 ANSIBLE_EXTRA_VARS="kafka_version=1.0.2" before_install: - sudo apt-get update -qq From e7dfa4dcd9612249ecb893916c04cbadd12b5039 Mon Sep 17 00:00:00 2001 From: licode Date: Fri, 11 Jan 2019 15:09:41 -0500 Subject: [PATCH 4/5] 1.0.1 version not existed, use 1.1.1 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8c0bb3d..9f41d32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,10 +8,10 @@ python: 2.7 env: matrix: - - ANSIBLE_VERSION=2.2.3.0 ANSIBLE_EXTRA_VARS="kafka_version=1.0.1 kafka_generate_broker_id=false" - ANSIBLE_VERSION=2.2.3.0 ANSIBLE_EXTRA_VARS="kafka_version=1.0.2" - - ANSIBLE_VERSION=2.4.2.0 ANSIBLE_EXTRA_VARS="kafka_version=1.0.1" + - ANSIBLE_VERSION=2.2.3.0 ANSIBLE_EXTRA_VARS="kafka_version=1.1.1" - ANSIBLE_VERSION=2.4.2.0 ANSIBLE_EXTRA_VARS="kafka_version=1.0.2" + - ANSIBLE_VERSION=2.4.2.0 ANSIBLE_EXTRA_VARS="kafka_version=1.1.1" before_install: - sudo apt-get update -qq From 76ef736e746913483b497be98db89d73ff404477 Mon Sep 17 00:00:00 2001 From: licode Date: Fri, 11 Jan 2019 16:57:01 -0500 Subject: [PATCH 5/5] TST: add python 3.6 --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f41d32..26b3e3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,11 @@ sudo: required dist: trusty language: python -python: 2.7 +python: + - 2.7 + - 3.6 env: - matrix: - ANSIBLE_VERSION=2.2.3.0 ANSIBLE_EXTRA_VARS="kafka_version=1.0.2" - ANSIBLE_VERSION=2.2.3.0 ANSIBLE_EXTRA_VARS="kafka_version=1.1.1" - ANSIBLE_VERSION=2.4.2.0 ANSIBLE_EXTRA_VARS="kafka_version=1.0.2"