Skip to content

Commit 4d0399c

Browse files
committed
gitlab: Add explicit become directives
Signed-off-by: Norman Ziegner <n.ziegner@hzdr.de>
1 parent 26386f4 commit 4d0399c

File tree

5 files changed

+17
-3
lines changed

5 files changed

+17
-3
lines changed

roles/gitlab/tasks/configure.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
---
77

88
- name: "Copy gitlab-secrets.json"
9+
become: true
910
ansible.builtin.copy:
1011
src: "{{ gitlab_secrets_file }}"
1112
dest: "/etc/gitlab/gitlab-secrets.json"
@@ -60,6 +61,7 @@
6061
- "Reconfigure Non Primary GitLab"
6162

6263
- name: "Create file to prevent Gitlab to restart before migrations"
64+
become: true
6365
ansible.builtin.copy:
6466
content: ""
6567
dest: "/etc/gitlab/skip-auto-reconfigure"
@@ -70,6 +72,7 @@
7072
when: "gitlab_is_primary"
7173

7274
- name: "Create file to prevent Gitlab to backup database"
75+
become: true
7376
ansible.builtin.copy:
7477
content: ""
7578
dest: "/etc/gitlab/skip-auto-backup"

roles/gitlab/tasks/feature-flag.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
---
77

88
- name: "Check if feature flag is already enabled for {{ gitlab_feature_flag.name }}"
9+
become: true
910
ansible.builtin.command:
1011
cmd: "gitlab-rails runner 'is_feature_enabled = Feature.enabled?(:{{ gitlab_feature_flag.name }}); puts is_feature_enabled'"
1112
register: "__gitlab_is_feature_enabled"
1213
changed_when: false
1314

1415
- name: "Enable or disable feature flag {{ gitlab_feature_flag.name }}"
16+
become: true
1517
ansible.builtin.command:
1618
cmd: "gitlab-rails runner 'Feature.{{ 'enable' if gitlab_feature_flag.enabled else 'disable' }}(:{{ gitlab_feature_flag.name }})'"
1719
changed_when: true

roles/gitlab/tasks/install.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,31 @@
1616
when: "ansible_facts.os_family == 'Debian'"
1717
block:
1818
- name: "Remove GitLab APT GPG key from legacy trusted.gpg keyring"
19+
become: true
1920
ansible.builtin.apt_key:
2021
url: "{{ gitlab_gpg_key_url }}"
2122
id: "{{ gitlab_gpg_key_id }}"
2223
state: "absent"
2324
when: "not __gitlab_is_initial_dryrun"
2425

2526
- name: "Remove GitLab APT repository from sources.list"
27+
become: true
2628
ansible.builtin.apt_repository:
2729
repo: "deb {{ gitlab_repo_url }} {{ ansible_facts.distribution_release }} main"
2830
state: "absent"
2931
filename: "gitlab_{{ gitlab_edition }}"
3032
update_cache: false
3133

3234
- name: "Remove GitLab source APT repository from sources.list"
35+
become: true
3336
ansible.builtin.apt_repository:
3437
repo: "deb-src {{ gitlab_repo_url }} {{ ansible_facts.distribution_release }} main"
3538
state: "absent"
3639
filename: "gitlab_{{ gitlab_edition }}"
3740
update_cache: false
3841

3942
- name: "Add GitLab APT repository"
43+
become: true
4044
ansible.builtin.deb822_repository:
4145
name: "{{ gitlab_edition }}"
4246
types:
@@ -52,6 +56,7 @@
5256
enabled: true
5357

5458
- name: "Update APT package cache"
59+
become: true
5560
ansible.builtin.apt:
5661
update_cache: true
5762
check_mode: false
@@ -61,6 +66,7 @@
6166
when: "ansible_facts.os_family == 'RedHat'"
6267
block:
6368
- name: "Add GitLab yum repository"
69+
become: true
6470
ansible.builtin.yum_repository:
6571
name: "gitlab_{{ gitlab_edition }}"
6672
description: "GitLab yum repo"
@@ -78,6 +84,7 @@
7884
metadata_expire: "300"
7985

8086
- name: "Add GitLab source yum repository"
87+
become: true
8188
ansible.builtin.yum_repository:
8289
name: "gitlab_{{ gitlab_edition }}-source"
8390
description: "GitLab source yum repo"
@@ -95,6 +102,7 @@
95102
metadata_expire: "300"
96103

97104
- name: "Update yum package cache"
105+
become: true
98106
ansible.builtin.dnf:
99107
update_cache: true
100108
check_mode: false
@@ -112,6 +120,7 @@
112120
- "__gitlab_rails_binary.stat.executable"
113121
block:
114122
- name: "Get the currently installed GitLab version"
123+
become: true
115124
ansible.builtin.slurp:
116125
path: "/var/opt/gitlab/gitlab-rails/VERSION"
117126
register: "__gitlab_version_base64"
@@ -147,6 +156,7 @@
147156
rescue:
148157

149158
- name: "Ensure GitLab directory exists"
159+
become: true
150160
ansible.builtin.file:
151161
path: "/etc/gitlab"
152162
state: "directory"
@@ -155,6 +165,7 @@
155165
mode: "0775"
156166

157167
- name: "Create file to detect a failed reconfigure"
168+
become: true
158169
ansible.builtin.copy:
159170
content: "This file is managed by Ansible."
160171
dest: "/etc/gitlab/reconfigure_failed"

roles/gitlab/tasks/main.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,13 @@
1313

1414
- name: "Reconfigure GitLab"
1515
ansible.builtin.import_tasks: "reconfigure.yml"
16-
become: true
1716
when: "__gitlab_reconfigure_failed.stat.exists"
1817

1918
- name: "Install GitLab"
2019
ansible.builtin.import_tasks: "install.yml"
21-
become: true
2220

2321
- name: "Configure GitLab"
2422
ansible.builtin.import_tasks: "configure.yml"
25-
become: true
2623

2724
- name: "Check if GitLab is already configured"
2825
ansible.builtin.stat:

roles/gitlab/tasks/reconfigure.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
- "gitlab_is_primary"
3131

3232
- name: "Remove file that indicates a failed reconfigure"
33+
become: true
3334
ansible.builtin.file:
3435
path: "/etc/gitlab/reconfigure_failed"
3536
state: "absent"

0 commit comments

Comments
 (0)