#633 Cleanup datagrepper playbook
Closed 2 years ago by eddiejennings. Opened 2 years ago by eddiejennings.

@@ -96,8 +96,8 @@

  #  - role: gluster/client

  #    name: gluster

  #    servers:

- #    - datagrepper01.phx2.fedoraproject.org

- #    - datagrepper02.phx2.fedoraproject.org

+ #    - datagrepper01.iad2.fedoraproject.org

+ #    - datagrepper02.iad2.fedoraproject.org

  #    username: "{{ datagrepperglusterusername }}"

  #    password: "{{ datagrepperglusterpassword }}"

  #    owner: apache

@@ -0,0 +1,3 @@

+ ---

+ retrace_user_home: /srv/retrace/home

+ retrace_user_uid_gid: 174

@@ -1,12 +1,42 @@

  ---

- # create uid - this is normaly done by retrace package

- # but the package is not installed yet at this momement

- - name: Create retrace user

+ - name: Make sure retrace user exists

    user:

      name: retrace

      group: retrace

-     uid: 174

-     home: /srv/retrace/home

+     system: yes

+     create_home: no

+   register: retrace_user_info

+ 

+ - name: Ensure retrace user has correct UID and home directory

+   when: >

+     retrace_user_info.changed or

+     retrace_user_info.uid != retrace_user_uid_gid or

+     retrace_user_info.home != retrace_user_home

+   block:

+   - name: Stop httpd service before modifying user

+     service:

+       name: httpd

+       state: stopped

+ 

+   # create uid - this is normaly done by retrace package

+   # but the package is not installed yet at this momement

+   - name: Ensure correct UID and home directory

+     user:

+       name: retrace

+       uid: "{{ retrace_user_uid_gid }}"

+       gid: "{{ retrace_user_uid_gid }}"

+       home: "{{ retrace_user_home }}"

+       create_home: yes

+ 

+   - name: Ensure correct GID

+     group:

+       name: retrace

+       gid: "{{ retrace_user_uid_gid }}"

+ 

+   - name: Restart httpd service after modifications are done

+     service:

+       name: httpd

+       state: started

  

  - name: Create directory for repositories

    file:

@@ -18,7 +18,7 @@

    - name: Get last subuid entry

      shell: |

        set -o pipefail

-       cut -d ':' -f2 /etc/subuid | sort | tail -1

+       sort -nrt: -k2 /etc/subuid | awk -F: 'NR == 1 { print $2 }'

      changed_when: false

      register: t_subuid

      args:

It appears there's an iad2 version of the two datagrepper phx2 nodes; thus, rather I replaced phx2 with iad2.

I'm going to close this pull request and fix my method of keeping in sync with the original repo, so I don't have extra, unintended commits.

Pull-Request has been closed by eddiejennings

2 years ago