From 53ef2040ec414fc8f5326a1e8a2f2b73460b1531 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Tue, 26 Jan 2016 13:20:35 -0500
Subject: [PATCH] Add ansible 2.0 support

Change-Id: Ieaa3b3b5c7cb5dd36ef468801f1510a4aa98a647
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 defaults/main.yaml |  8 ++++----
 handlers/main.yaml |  4 ++--
 requirements.txt   |  2 +-
 tasks/config.yaml  | 10 +++++++++-
 tasks/main.yaml    |  5 ++---
 tests/inventory    |  6 +++++-
 tests/test.yaml    |  2 +-
 7 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/defaults/main.yaml b/defaults/main.yaml
index 21713be..4f939f4 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -14,13 +14,13 @@
 ---
 # tasks/config.yaml
 zuul_user_name: zuul
-zuul_user_group: "{{ zuul_user_name }}"
-zuul_user_home: "/var/lib/{{ zuul_user_name }}"
+zuul_user_group: zuul
+zuul_user_home: /var/lib/zuul
 
 zuul_file_layout_dest: /etc/zuul/config/
-zuul_file_layout_group: "{{ ansible_ssh_user }}"
+zuul_file_layout_group: "{{ ansible_user }}"
 zuul_file_layout_mode: "0755"
-zuul_file_layout_owner: "{{ ansible_ssh_user }}"
+zuul_file_layout_owner: "{{ ansible_user }}"
 zuul_file_layout_src: etc/zuul/config/
 
 zuul_config_gearman_port: 4730
diff --git a/handlers/main.yaml b/handlers/main.yaml
index db0c935..60265f0 100644
--- a/handlers/main.yaml
+++ b/handlers/main.yaml
@@ -13,15 +13,15 @@
 # under the License.
 ---
 - name: Reload zuul-merger
+  become: yes
   service:
     name: zuul-merger
     state: reloaded
-  sudo: yes
   when: zuul_service_zuul_merger_state == "started" and not __zuul_merger_service.changed
 
 - name: Reload zuul-server
+  become: yes
   service:
     name: zuul-server
     state: reloaded
-  sudo: yes
   when: zuul_service_zuul_server_state == "started" and not __zuul_server_service.changed
diff --git a/requirements.txt b/requirements.txt
index b32557e..1ab0ddd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-ansible<2.0
+ansible>=2.0.0
diff --git a/tasks/config.yaml b/tasks/config.yaml
index 8794646..9492577 100644
--- a/tasks/config.yaml
+++ b/tasks/config.yaml
@@ -13,10 +13,12 @@
 # under the License.
 ---
 - name: Create group account.
+  become: yes
   group:
     name: "{{ zuul_user_group }}"
 
 - name: Create user account.
+  become: yes
   user:
     createhome: yes
     home: "{{ zuul_user_home }}"
@@ -24,6 +26,7 @@
     name: "{{ zuul_user_name }}"
 
 - name: Create required directories.
+  become: yes
   file:
     group: "{{ zuul_user_group }}"
     owner: "{{ zuul_user_name }}"
@@ -34,6 +37,7 @@
     - /var/log/zuul
 
 - name: Template zuul configuration file.
+  become: yes
   template:
     dest: "{{ zuul_template_zuul_conf_dest }}"
     src: "{{ zuul_template_zuul_conf_src }}"
@@ -42,24 +46,28 @@
     - Reload zuul-server
 
 - name: Copy gearman logging file.
+  become: yes
   copy:
     dest: "{{ zuul_config_gearman_server_log_config }}"
     src: "{{ zuul_file_gearman_logging_conf }}"
   notify: Reload zuul-server
 
 - name: Copy merger logging file.
+  become: yes
   copy:
     dest: "{{ zuul_config_merger_log_config }}"
     src: "{{ zuul_file_merger_logging_conf }}"
   notify: Reload zuul-merger
 
 - name: Copy server logging file.
+  become: yes
   copy:
     dest: "{{ zuul_config_zuul_log_config }}"
     src: "{{ zuul_file_server_logging_conf }}"
   notify: Reload zuul-server
 
 - name: Create layout config directory.
+  become: yes
   file:
     dest: "{{ zuul_file_layout_dest }}"
     group: "{{ zuul_file_layout_group }}"
@@ -68,7 +76,7 @@
     state: directory
 
 - name: Rsync layout configuration.
-  sudo: no
+  become: no
   synchronize:
     delete: yes
     dest: "{{ zuul_file_layout_dest }}"
diff --git a/tasks/main.yaml b/tasks/main.yaml
index 77b2d92..d3942a0 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -16,10 +16,9 @@
   include_vars: "{{ ansible_os_family }}.yaml"
 
 - include: install.yaml
-  sudo: yes
+  become: yes
 
 - include: config.yaml
-  sudo: yes
 
 - include: service.yaml
-  sudo: yes
+  become: yes
diff --git a/tests/inventory b/tests/inventory
index 68b2dac..3ba1200 100644
--- a/tests/inventory
+++ b/tests/inventory
@@ -1,2 +1,6 @@
 [all]
-localhost
+# NOTE(pabelanger): We should not be hard-coding jenkins here, since it limits
+# who can run this test.  However, ansible 2.0 has broken ansible_user and it
+# now requires to be setup, otherwise it will return nil[1].
+# [1] https://github.com/ansible/ansible/issues/13669
+localhost ansible_user=jenkins
diff --git a/tests/test.yaml b/tests/test.yaml
index 5a78148..f9f1821 100644
--- a/tests/test.yaml
+++ b/tests/test.yaml
@@ -13,7 +13,7 @@
 # under the License.
 ---
 - hosts: localhost
-  sudo: yes
+  become: yes
   vars:
     rolename: "{{ lookup('pipe', 'pwd') | dirname | basename }}"
   pre_tasks: