summaryrefslogtreecommitdiff
path: root/per-service
diff options
context:
space:
mode:
authorBen Copeland <ben.copeland@linaro.org>2016-02-22 16:41:24 +0000
committerBen Copeland <ben.copeland@linaro.org>2016-02-23 09:20:42 +0000
commit725ae6613b0a8232603d80be81ae495cb01023f0 (patch)
tree0d94a5ba3561afcfea756f734689775f15623c65 /per-service
parent45ba2720847372c075825c2e04aa691bf220b4cd (diff)
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>
Diffstat (limited to 'per-service')
-rw-r--r--per-service/git-servers/roles/gerrit-setup/tasks/gerrit.yml12
-rw-r--r--per-service/git-servers/roles/gitolite/tasks/gitolite-install.yml2
-rw-r--r--per-service/git-servers/roles/gitolite/tasks/gitolite-tools.yml2
-rw-r--r--per-service/git-servers/roles/grokmirror/tasks/master.yml2
4 files changed, 9 insertions, 9 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}}