Remove become_user, use owner/group instead

smartlogic · May 30, 2024 · 6864950 · 6864950
1 parent c8a403c
commit 6864950
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 33 deletions.
diff --git a/tasks/blackbox_exporter.yml b/tasks/blackbox_exporter.yml
@@ -3,64 +3,63 @@
     path: "/home/prometheus/blackbox_exporter/{{ blackbox_exporter_version }}"
     state: directory
     mode: 0700
-  become: yes
-  become_user: prometheus
+    owner: prometheus
+    group: prometheus
+  become: true
 
 - name: "Download the blackbox_exporter file"
   get_url:
     url: "https://github.com/prometheus/blackbox_exporter/releases/download/v{{ blackbox_exporter_version }}/blackbox_exporter-{{ blackbox_exporter_version }}.linux-amd64.tar.gz"
     dest: "/home/prometheus/blackbox_exporter/{{ blackbox_exporter_version }}/blackbox_exporter.tar.gz"
     mode: 0400
     checksum: "sha256:{{ blackbox_exporter_checksum }}"
-  become: yes
-  become_user: prometheus
+    owner: prometheus
+    group: prometheus
+  become: true
 
 - name: stat extracted folder
   stat: path="/home/prometheus/blackbox_exporter/blackbox_exporter/{{ blackbox_exporter_version }}/blackbox_exporter-{{ blackbox_exporter_version }}.linux-amd64"
   register: blackbox_exporter_extracted_folder_stat
-  become: yes
-  become_user: prometheus
+  become: true
 
 - name: stat final folder
   stat: path="/home/prometheus/blackbox_exporter/{{ blackbox_exporter_version }}/blackbox_exporter"
   register: blackbox_exporter_folder_stat
-  become: yes
-  become_user: prometheus
+  become: true
 
 - name: "Extract archive"
   unarchive:
     src: "/home/prometheus/blackbox_exporter/{{ blackbox_exporter_version }}/blackbox_exporter.tar.gz"
     dest: "/home/prometheus/blackbox_exporter/{{ blackbox_exporter_version }}/"
     remote_src: yes
+    owner: prometheus
+    group: prometheus
   when: blackbox_exporter_extracted_folder_stat.stat.exists == False and blackbox_exporter_folder_stat.stat.exists == False
-  become: yes
-  become_user: prometheus
+  become: true
 
 - name: stat extracted folder
   stat: path="/home/prometheus/blackbox_exporter/{{ blackbox_exporter_version }}/blackbox_exporter-{{ blackbox_exporter_version }}.linux-amd64"
   register: blackbox_exporter_extracted_folder_stat
-  become: yes
-  become_user: prometheus
+  become: true
 
 - name: Move extracted folder to standard path
   command: mv /home/prometheus/blackbox_exporter/{{ blackbox_exporter_version }}/blackbox_exporter-{{ blackbox_exporter_version }}.linux-amd64 /home/prometheus/blackbox_exporter/{{ blackbox_exporter_version }}/blackbox_exporter
   when: blackbox_exporter_extracted_folder_stat.stat.exists
-  become: yes
-  become_user: prometheus
+  become: true
 
 - name: Ensure that blackbox exporter can use kernel functions needed
   capabilities:
     path: /home/prometheus/blackbox_exporter/{{ blackbox_exporter_version }}/blackbox_exporter/blackbox_exporter
     capability: cap_net_raw+ep
     state: present
-  become: yes
+  become: true
 
 - name: Template out the service file
   template:
     src: blackbox_exporter.service.j2
     dest: /etc/systemd/system/blackbox_exporter.service
     mode: 0644
-  become: yes
+  become: true
   notify:
     - reload systemd
     - restart blackbox_exporter
@@ -69,4 +68,4 @@
   systemd:
     enabled: yes
     name: blackbox_exporter
-  become: yes
+  become: true
diff --git a/tasks/elasticsearch_exporter.yml b/tasks/elasticsearch_exporter.yml
@@ -3,57 +3,56 @@
     path: "/home/prometheus/elasticsearch_exporter/{{ elasticsearch_exporter_version }}"
     state: directory
     mode: 0700
-  become: yes
-  become_user: prometheus
+    owner: prometheus
+    group: prometheus
+  become: true
 
 - name: "Download the elasticsearch_exporter file"
   get_url:
     url: "https://github.com/justwatchcom/elasticsearch_exporter/releases/download/v{{ elasticsearch_exporter_version }}/elasticsearch_exporter-{{ elasticsearch_exporter_version }}.linux-amd64.tar.gz"
     dest: "/home/prometheus/elasticsearch_exporter/{{ elasticsearch_exporter_version }}/elasticsearch_exporter.tar.gz"
     mode: 0400
     checksum: "sha256:{{ elasticsearch_exporter_checksum }}"
-  become: yes
-  become_user: prometheus
+    owner: prometheus
+    group: prometheus
+  become: true
 
 - name: stat extracted folder
   stat: path="/home/prometheus/elasticsearch_exporter/{{ elasticsearch_exporter_version }}/elasticsearch_exporter-{{ elasticsearch_exporter_version }}.linux-amd64"
   register: elasticsearch_exporter_extracted_folder_stat
-  become: yes
-  become_user: prometheus
+  become: true
 
 - name: stat final folder
   stat: path="/home/prometheus/elasticsearch_exporter/{{ elasticsearch_exporter_version }}/elasticsearch_exporter"
   register: elasticsearch_exporter_folder_stat
-  become: yes
-  become_user: prometheus
+  become: true
 
 - name: "Extract archive"
   unarchive:
     src: "/home/prometheus/elasticsearch_exporter/{{ elasticsearch_exporter_version }}/elasticsearch_exporter.tar.gz"
     dest: "/home/prometheus/elasticsearch_exporter/{{ elasticsearch_exporter_version }}/"
     remote_src: yes
+    owner: prometheus
+    group: prometheus
   when: elasticsearch_exporter_extracted_folder_stat.stat.exists == False and elasticsearch_exporter_folder_stat.stat.exists == False
-  become: yes
-  become_user: prometheus
+  become: true
 
 - name: stat extracted folder
   stat: path="/home/prometheus/elasticsearch_exporter/{{ elasticsearch_exporter_version }}/elasticsearch_exporter-{{ elasticsearch_exporter_version }}.linux-amd64"
   register: elasticsearch_exporter_extracted_folder_stat
-  become: yes
-  become_user: prometheus
+  become: true
 
 - name: Move extracted folder to standard path
   command: mv /home/prometheus/elasticsearch_exporter/{{ elasticsearch_exporter_version }}/elasticsearch_exporter-{{ elasticsearch_exporter_version }}.linux-amd64 /home/prometheus/elasticsearch_exporter/{{ elasticsearch_exporter_version }}/elasticsearch_exporter
   when: elasticsearch_exporter_extracted_folder_stat.stat.exists
-  become: yes
-  become_user: prometheus
+  become: true
 
 - name: Template out the service file
   template:
     src: elasticsearch_exporter.service.j2
     dest: /etc/systemd/system/elasticsearch_exporter.service
     mode: 0644
-  become: yes
+  become: true
   notify:
     - reload systemd
     - restart elasticsearch_exporter
@@ -62,4 +61,4 @@
   systemd:
     enabled: yes
     name: elasticsearch_exporter
-  become: yes
+  become: true