git-servers: update the git-servers playbook to use become_user

sudo_user is deprecated. This commit updates our git-servers
playbook to use the new become_user method.

Change-Id: Iad88796235e775b8f651cc39eceb7046c77696a9
Reviewed-on: https://review.linaro.org/10601
Reviewed-by: Andy Doan <andy.doan+gerrit@linaro.org>
Reviewed-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>

6 files changed, 13 insertions, 15 deletions

diff --git a/per-service/git-servers/roles/gerrit-setup/tasks/gerrit.yml b/per-service/git-servers/roles/gerrit-setup/tasks/gerrit.yml
index 6199ac3a..7e3041e1 100644
--- a/per-service/git-servers/roles/gerrit-setup/tasks/gerrit.yml
+++ b/per-service/git-servers/roles/gerrit-setup/tasks/gerrit.yml
@@ -7,7 +7,7 @@
   file: path={{gerrit_root}} owner={{git_user}} group={{git_user}} mode=0755 state=directory
 
 - name: Download Gerrit
-  sudo_user: "{{git_user}}"
+  become_user: "{{git_user}}"
   get_url: url={{gerrit_download_link}} dest={{gerrit_root}}/gerrit.war mode=0750
   tags:
   - gerrit-conf
@@ -18,12 +18,12 @@
   ignore_errors: True
 
 - name: Initialize Gerrit
-  sudo_user: "{{git_user}}"
+  become_user: "{{git_user}}"
   command: chdir={{gerrit_root}} java -jar gerrit.war init --batch --no-auto-start -d {{gerrit_root}}
   when: gerrit_initialized.stat.exists == False
 
 - name: Create Gerrit.conf
-  sudo_user: "{{git_user}}"
+  become_user: "{{git_user}}"
   template: src="files/gerrit/{{gerrit_host}}" dest={{gerrit_root}}/etc/gerrit.config
             backup=yes
   register: gerrit_conf
@@ -31,7 +31,7 @@
   - gerrit-conf
 
 - name: Set up Gerrit secure.conf
-  sudo_user: "{{git_user}}"
+  become_user: "{{git_user}}"
   template: src="secure.config" dest={{gerrit_root}}/etc/secure.config
             mode=0600 backup=yes
   tags:
@@ -40,7 +40,7 @@
   - restart-gerrit
 
 - name: Configure Gerrit
-  sudo_user: "{{git_user}}"
+  become_user: "{{git_user}}"
   command: chdir={{gerrit_root}} java -jar bin/gerrit.war init --batch --no-auto-start -d {{gerrit_root}}
   when: gerrit_conf.changed
   tags:
@@ -53,7 +53,7 @@
   register: gerrit_index
 
 - name: Initialize Gerrit index
-  sudo_user: "{{git_user}}"
+  become_user: "{{git_user}}"
   when: gerrit_index.stat.exists == False
   command: chdir={{gerrit_root}} java -jar bin/gerrit.war reindex
 
diff --git a/per-service/git-servers/roles/gitolite/tasks/gitolite-install.yml b/per-service/git-servers/roles/gitolite/tasks/gitolite-install.yml
index bf07ac70..a023baf1 100644
--- a/per-service/git-servers/roles/gitolite/tasks/gitolite-install.yml
+++ b/per-service/git-servers/roles/gitolite/tasks/gitolite-install.yml
@@ -125,7 +125,7 @@
         dest=/home/{{ git_user }}/gitolite
         update=yes version={{ gitolite_rev }}
         accept_hostkey=yes
-  sudo_user: "{{ git_user }}"
+  become_user: "{{ git_user }}"
   when: hosttype == "git-main"
   register: gitolite_updated
   tags:
diff --git a/per-service/git-servers/roles/gitolite/tasks/gitolite-tools.yml b/per-service/git-servers/roles/gitolite/tasks/gitolite-tools.yml
index 9055e08a..668d1a55 100644
--- a/per-service/git-servers/roles/gitolite/tasks/gitolite-tools.yml
+++ b/per-service/git-servers/roles/gitolite/tasks/gitolite-tools.yml
@@ -42,6 +42,6 @@
 - name: Initial fetch of user SSH keys
   shell: "{{tools_checkout_dir}}/linaro-git-tools/gitolite-tools/gitolite-keys"
   when: not gitolite_keys_run.stat.exists
-  sudo_user: "{{git_user}}"
+  become_user: "{{git_user}}"
   tags:
     - gitolite
diff --git a/per-service/git-servers/roles/grokmirror/tasks/master.yml b/per-service/git-servers/roles/grokmirror/tasks/master.yml
index 2902a31e..1593cd7c 100644
--- a/per-service/git-servers/roles/grokmirror/tasks/master.yml
+++ b/per-service/git-servers/roles/grokmirror/tasks/master.yml
@@ -7,7 +7,7 @@
   when: gitolite_st.stat is defined and gitolite_st.stat.isdir
   register: groktrigger
   changed_when: "'updating gitolite-admin' in groktrigger.stdout"
-  sudo_user: "{{git_user}}"
+  become_user: "{{git_user}}"
 
 - name: See if gerrit hook is needed
   stat: path={{gerrit_root}}
diff --git a/roles/postgres/handlers/main.yml b/roles/postgres/handlers/main.yml
index 433c4029..96b1448b 100644
--- a/roles/postgres/handlers/main.yml
+++ b/roles/postgres/handlers/main.yml
@@ -1,3 +1,2 @@
 - name: restart-postgres
   service: name=postgresql state=restarted
-  sudo: yes
diff --git a/roles/postgres/tasks/main.yml b/roles/postgres/tasks/main.yml
index 8c6218ff..8aa46063 100644
--- a/roles/postgres/tasks/main.yml
+++ b/roles/postgres/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-# Need to always define 'sudo_user: postgres' or it will not work!
+# Need to always define 'become_user: postgres' or it will not work!
 
 - name: Install packages
   apt: pkg={{item}} state=installed update-cache=yes
@@ -20,7 +20,7 @@
   service: name=postgresql state=started enabled=yes
 
 - name: Create postgres user
-  sudo_user: postgres
+  become_user: "postgres"
   postgresql_user: user={{db_user}}
                    password={{db_password}}
                    role_attr_flags=CREATEDB,NOSUPERUSER
@@ -28,7 +28,7 @@
     - database
 
 - name: Create postgres database
-  sudo_user: postgres
+  become_user: "postgres"
   postgresql_db: name={{db_name}}
                  owner={{db_user}}
                  template=template0
@@ -39,8 +39,7 @@
 - name: Alter postgresql database template for extension hstore
   command: psql {{db_name}} -c 'create extension if not exists hstore;'
   register: psql_hstore
-  sudo: yes
-  sudo_user: postgres
+  become_user: "postgres"
   ignore_errors: True
   changed_when: not psql_hstore.stderr
   when: settings_hstore_extension is defined and setting_hstore_extension == true