diff options
12 files changed, 6 insertions, 26 deletions
diff --git a/per-service/git-servers/gerrit-mirror.yml b/per-service/git-servers/gerrit-mirror.yml index ad6c8ee9..d81b5518 100644 --- a/per-service/git-servers/gerrit-mirror.yml +++ b/per-service/git-servers/gerrit-mirror.yml @@ -2,7 +2,7 @@ - hosts: - gerrit-mirror - sudo: yes + become: yes gather_facts: no vars_files: - ["{{secrets_dir}}/host_vars/{{inventory_hostname}}", "vars/empty.yml"] @@ -11,7 +11,7 @@ - hosts: - projectara-git.linaro.org - sudo: yes + become: yes gather_facts: no roles: - mirroring-ara diff --git a/per-service/git-servers/gerrit.yml b/per-service/git-servers/gerrit.yml index 3705591d..467047ac 100644 --- a/per-service/git-servers/gerrit.yml +++ b/per-service/git-servers/gerrit.yml @@ -2,7 +2,7 @@ - hosts: - gerrit-public - gerrit-private - sudo: yes + become: yes gather_facts: no vars_files: - ["{{secrets_dir}}/host_vars/{{inventory_hostname}}", "vars/empty.yml"] diff --git a/per-service/git-servers/gitolite.yml b/per-service/git-servers/gitolite.yml index 19a37acd..87b780e8 100644 --- a/per-service/git-servers/gitolite.yml +++ b/per-service/git-servers/gitolite.yml @@ -1,7 +1,7 @@ --- - hosts: - git - sudo: yes + become: yes gather_facts: no vars_files: - ["{{secrets_dir}}/host_vars/{{inventory_hostname}}", "vars/empty.yml"] @@ -24,7 +24,7 @@ - hosts: - git-us.linaro.org - sudo: yes + become: yes gather_facts: no vars_files: - ["{{secrets_dir}}/host_vars/{{inventory_hostname}}", "vars/empty.yml"] diff --git a/per-service/git-servers/roles/apache-conf/tasks/main.yml b/per-service/git-servers/roles/apache-conf/tasks/main.yml index cb4832c4..5e5f501a 100644 --- a/per-service/git-servers/roles/apache-conf/tasks/main.yml +++ b/per-service/git-servers/roles/apache-conf/tasks/main.yml @@ -40,7 +40,6 @@ - name: Disable Apache default web site command: a2dissite 000-default - sudo: yes register: result changed_when: "'already disabled' not in result.stdout" notify: diff --git a/per-service/git-servers/roles/apache-website/handlers/main.yml b/per-service/git-servers/roles/apache-website/handlers/main.yml index f9460000..e95706a9 100644 --- a/per-service/git-servers/roles/apache-website/handlers/main.yml +++ b/per-service/git-servers/roles/apache-website/handlers/main.yml @@ -1,7 +1,5 @@ - name: restart-apache service: name=apache2 state=restarted - sudo: yes - name: reload-apache service: name=apache2 state=reloaded - sudo: yes diff --git a/per-service/git-servers/roles/gerrit-bot-user/tasks/main.yml b/per-service/git-servers/roles/gerrit-bot-user/tasks/main.yml index 8d317e5f..27d1b265 100644 --- a/per-service/git-servers/roles/gerrit-bot-user/tasks/main.yml +++ b/per-service/git-servers/roles/gerrit-bot-user/tasks/main.yml @@ -1,21 +1,18 @@ - name: Make sure that ~/.ssh exists for git user file: state=directory dest=/home/{{git_user}}/.ssh/ owner={{git_user}} mode=0750 - sudo: yes tags: - secrets - name: Install linaro-gerrit-bot private SSH key copy: src={{secrets_dir}}/files/linaro-gerrit-bot.key dest=/home/{{git_user}}/.ssh/id_rsa owner={{git_user}} mode=600 backup=yes - sudo: yes tags: - secrets - name: Install linaro-gerrit-bot public SSH key copy: src={{secrets_dir}}/files/linaro-gerrit-bot.pub dest=/home/{{git_user}}/.ssh/id_rsa.pub owner={{git_user}} mode=600 backup=yes - sudo: yes tags: - secrets diff --git a/per-service/git-servers/roles/gerrit-setup/handlers/main.yml b/per-service/git-servers/roles/gerrit-setup/handlers/main.yml index bacd7fa7..40095c30 100644 --- a/per-service/git-servers/roles/gerrit-setup/handlers/main.yml +++ b/per-service/git-servers/roles/gerrit-setup/handlers/main.yml @@ -1,3 +1,2 @@ - name: restart-gerrit command: "{{gerrit_root}}/bin/gerrit.sh restart" - sudo: yes diff --git a/per-service/git-servers/roles/gerrit-setup/tasks/deps.yml b/per-service/git-servers/roles/gerrit-setup/tasks/deps.yml index d37c238f..0d600a20 100644 --- a/per-service/git-servers/roles/gerrit-setup/tasks/deps.yml +++ b/per-service/git-servers/roles/gerrit-setup/tasks/deps.yml @@ -12,7 +12,6 @@ - name: Install Apache modules to support Gerrit command: a2enmod {{item}} creates=/etc/apache2/mods-enabled/{{item}}.load - sudo: yes with_items: - proxy - proxy_http 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 b99b504f..6199ac3a 100644 --- a/per-service/git-servers/roles/gerrit-setup/tasks/gerrit.yml +++ b/per-service/git-servers/roles/gerrit-setup/tasks/gerrit.yml @@ -18,13 +18,11 @@ ignore_errors: True - name: Initialize Gerrit - sudo: yes sudo_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: yes sudo_user: "{{git_user}}" template: src="files/gerrit/{{gerrit_host}}" dest={{gerrit_root}}/etc/gerrit.config backup=yes @@ -33,7 +31,6 @@ - gerrit-conf - name: Set up Gerrit secure.conf - sudo: yes sudo_user: "{{git_user}}" template: src="secure.config" dest={{gerrit_root}}/etc/secure.config mode=0600 backup=yes @@ -43,7 +40,6 @@ - restart-gerrit - name: Configure Gerrit - sudo: yes sudo_user: "{{git_user}}" command: chdir={{gerrit_root}} java -jar bin/gerrit.war init --batch --no-auto-start -d {{gerrit_root}} when: gerrit_conf.changed @@ -57,7 +53,6 @@ register: gerrit_index - name: Initialize Gerrit index - sudo: yes sudo_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/hostname/tasks/main.yaml b/per-service/git-servers/roles/hostname/tasks/main.yaml index 84ce0d19..ee2745b3 100644 --- a/per-service/git-servers/roles/hostname/tasks/main.yaml +++ b/per-service/git-servers/roles/hostname/tasks/main.yaml @@ -1,8 +1,6 @@ - name: Set /etc/hostname copy: content="{{inventory_hostname}}" dest=/etc/hostname mode=0644 - sudo: yes register: res - name: Reinit hostname command command: hostname -F /etc/hostname - sudo: yes when: res.changed diff --git a/roles/apache-site/handlers/main.yml b/roles/apache-site/handlers/main.yml index 233868a5..52b2dca0 100644 --- a/roles/apache-site/handlers/main.yml +++ b/roles/apache-site/handlers/main.yml @@ -1,3 +1,2 @@ - name: restart-apache - service: name=apache2 state=restarted - sudo: yes + service: name=apache2 state=restarted
\ No newline at end of file diff --git a/roles/apache-site/tasks/main.yml b/roles/apache-site/tasks/main.yml index 38ded90d..b4e29c4a 100644 --- a/roles/apache-site/tasks/main.yml +++ b/roles/apache-site/tasks/main.yml @@ -2,7 +2,6 @@ template: src=files/{{src}} dest=/etc/apache2/sites-available/{{config}} mode=0644 backup=yes owner=root group=root - sudo: yes notify: - restart-apache tags: @@ -10,7 +9,6 @@ - apache-conf - name: Add Apache 2.4 compatibility symlink - sudo: yes file: state=link force=yes src={{config}} dest=/etc/apache2/sites-available/{{config}}.conf @@ -19,7 +17,6 @@ - name: Enable site config command: a2ensite {{config}} - sudo: yes register: result changed_when: "'already enabled' not in result.stdout" notify: @@ -29,7 +26,6 @@ - name: Disable OS default site config command: a2dissite 000-default - sudo: yes register: result changed_when: "'already disabled' not in result.stdout" notify: |