From d7bf07088006e672a3e9a94602329d4ca00ea3e9 Mon Sep 17 00:00:00 2001
From: priitliivak <Priit.Liivak@nortal.com>
Date: Thu, 30 Aug 2018 18:52:49 +0300
Subject: [PATCH] Fixing the use of deprecated ansible functionality

---
 handlers/main.yml       |  6 +++---
 tasks/kafka-cfg.yml     | 10 +++++-----
 tasks/kafka-install.yml | 16 ++++++++--------
 tasks/limits.yml        |  6 +++---
 tasks/system.yml        |  6 +++---
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/handlers/main.yml b/handlers/main.yml
index 8bd3721..107db5f 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,13 +1,13 @@
 ---
 - name: "start kafka"
   service: name=kafka state=started
-  sudo: yes
+  become: yes
 
 - name: "stop kafka"
   service: name=kafka state=stopped
-  sudo: yes
+  become: yes
 
 - name: "restart kafka"
   service: name=kafka state=restarted
-  sudo: yes
+  become: yes
 
diff --git a/tasks/kafka-cfg.yml b/tasks/kafka-cfg.yml
index 6e573b5..0a5d6b1 100644
--- a/tasks/kafka-cfg.yml
+++ b/tasks/kafka-cfg.yml
@@ -23,7 +23,7 @@
 
 - name: "Raise reserved broker id range"
   set_fact: kafka_reserved_broker_max_id=1000000000
-  when: kafka_generate_broker_id | bool and kafka_version | version_compare('0.9.0.0', '>=')
+  when: kafka_generate_broker_id | bool and kafka_version is version('0.9.0.0', '>=')
 
 - name: "Generate the zookeeper hosts connection string"
   set_fact: kafka_zookeeper_connection_string="{{ kafka_zookeeper_hosts | join(':' ~ kafka_zookeeper_port ~ ',') }}:{{ kafka_zookeeper_port }}"
@@ -33,7 +33,7 @@
 
 - name: "Render and write out kafka configuration files"
   template: src=usr/local/kafka/config/{{ item }}.j2 dest="{{ kafka_conf_dir }}/{{ item }}" mode=0640 owner={{ kafka_user }} group={{ kafka_group }}
-  sudo: yes
+  become: yes
   with_items:
     - server.properties
     - producer.properties
@@ -44,20 +44,20 @@
 
 - name: "Render and write out kafka user env file"
   template: src=etc/defaults/kafka.j2 dest="/etc/default/kafka" mode=0644 owner=root group=root
-  sudo: yes
+  become: yes
   notify:
     - restart kafka
 
 - name: "Enable kafka system service"
   service: name=kafka state=started enabled=yes
-  sudo: yes
+  become: yes
   tags:
     - kafka-install
 
 - name: "Link alternate logs directory and touch output files"
   shell: "( test ! -e /usr/local/kafka/logs || rm -rf /usr/local/kafka/logs ) && ln -s {{ kafka_log_dir }} /usr/local/kafka/logs && touch {{ kafka_log_dir }}/state-change.log {{ kafka_log_dir }}/kafkaServer.out && chown {{ kafka_user }}:{{ kafka_group }} {{ kafka_log_dir }}/state-change.log {{ kafka_log_dir }}/kafkaServer.out"
   changed_when: False
-  sudo: yes
+  become: yes
 
 - meta: flush_handlers
 
diff --git a/tasks/kafka-install.yml b/tasks/kafka-install.yml
index eec3645..39f0d40 100644
--- a/tasks/kafka-install.yml
+++ b/tasks/kafka-install.yml
@@ -19,42 +19,42 @@
 
 - name: "Extract downloaded kafka archive"
   unarchive: copy=no creates=/usr/local/kafka_{{ kafka_scala_version }}-{{ kafka_version }} dest=/usr/local src={{ kafka_bin_tmp }}
-  sudo: yes
+  become: yes
 
 - name: "Link /usr/local/kafka to the right version"
   file: path=/usr/local/kafka state=link src=/usr/local/kafka_{{ kafka_scala_version }}-{{ kafka_version }}
-  sudo: yes
+  become: yes
 
 - name: "Create upstart config"
   template: dest=/etc/init/kafka.conf src=etc/init/kafka.conf.j2 mode=0644 owner=root group=root
-  sudo: yes
+  become: yes
   when: ansible_service_mgr != 'systemd'
   notify:
     - restart kafka
 
 - name: "Create systemd config"
   template: dest=/etc/systemd/system/kafka.service src=etc/systemd/system/kafka.service.j2 mode=0644 owner=root group=root
-  sudo: yes
+  become: yes
   when: ansible_service_mgr == 'systemd'
   notify:
     - restart kafka
 
 - name: "Reload systemctl daemon"
   command: systemctl daemon-reload
-  sudo: yes
+  become: yes
   when: ansible_service_mgr == 'systemd'
 
 - name: "Create kafka directories"
   file: path={{ item }} state=directory mode=0755 owner={{ kafka_user }} group={{ kafka_group }}
-  sudo: yes
+  become: yes
   with_items:
     - "{{ kafka_data_dir }}"
     - "{{ kafka_log_dir }}"
 
 - name: "Remove lost+found in the datadir"
   file: path="{{ kafka_data_dir }}/lost+found" state=absent
-  sudo: yes
+  become: yes
 
 - name: "Symlink kafka_conf_dir to /usr/local/kafka/config"
   file: src=/usr/local/kafka/config path={{ kafka_conf_dir }} state=link
-  sudo: yes
+  become: yes
diff --git a/tasks/limits.yml b/tasks/limits.yml
index b51ea47..e685a30 100644
--- a/tasks/limits.yml
+++ b/tasks/limits.yml
@@ -1,13 +1,13 @@
 ---
 - name: "Increase soft nofile limit for kafka system user"
   lineinfile: dest=/etc/security/limits.conf regexp="^[ \t]*{{ kafka_user }} soft nofile .+[ \t]*$" line="kafka soft nofile {{ kafka_nofiles_limit }}" state=present create=yes
-  sudo: yes
+  become: yes
 
 - name: "Increase hard nofile limit for kafka system user"
   lineinfile: dest=/etc/security/limits.conf regexp="^[ \t]*{{ kafka_user }} hard nofile .+[ \t]*$" line="kafka hard nofile {{ kafka_nofiles_limit }}" state=present create=yes
-  sudo: yes
+  become: yes
 
 - name: "Add 'session required pam_limits.so' to /etc/pam.d/common-session"
   lineinfile: dest=/etc/pam.d/common-session regexp="^[ \t]*session required pam_limits\.so[ \t]*$" line="session required pam_limits.so" state=present create=yes
-  sudo: yes
+  become: yes
 
diff --git a/tasks/system.yml b/tasks/system.yml
index c1a8f68..55d0e44 100644
--- a/tasks/system.yml
+++ b/tasks/system.yml
@@ -1,13 +1,13 @@
 ---
 - name: "Create kafka system group"
   group: name={{ kafka_group }} system=yes
-  sudo: yes
+  become: yes
 
 - name: "Create kafka system user"
   user: name={{ kafka_user }} system=yes group={{ kafka_group }}
-  sudo: yes
+  become: yes
 
 - name: "Add kafka utilities to /etc/profile* so they'll be available in $PATH"
   lineinfile: dest=/etc/profile.d/Z99-kafka.sh regexp="^export PATH=.*$" line='export PATH="${PATH}:/usr/local/kafka/bin"' state=present create=yes
-  sudo: yes
+  become: yes