diff --git a/ansible/README.md b/ansible/README.md index 1aded40..0ee9424 100644 --- a/ansible/README.md +++ b/ansible/README.md @@ -11,6 +11,7 @@ Loosely copied from the CentOS ansible infrastructure. ``` . ├── ansible.cfg +├── collections ├── files -> playbooks/files ├── handlers -> playbooks/handlers ├── inventories diff --git a/ansible/inventories/production/hosts.ini b/ansible/inventories/production/hosts.ini index 09410b8..d9357f7 100644 --- a/ansible/inventories/production/hosts.ini +++ b/ansible/inventories/production/hosts.ini @@ -22,6 +22,7 @@ build-a-box.rockylinux.org ansible_host=10.100.1.112 idp001.rockylinux.org ansible_host=10.100.x.x chrony001.rockylinux.org ansiblehost=10.100.3.110 chrony002.rockylinux.org ansiblehost=10.200.3.111 +git.rockylinux.org ansible_host=10.100.1.113 [ipsilon] idp001.rockylinux.org ansible_host=10.100.x.x @@ -29,3 +30,6 @@ idp001.rockylinux.org ansible_host=10.100.x.x [chronyservers] chrony001.rockylinux.org ansiblehost=10.100.3.110 chrony002.rockylinux.org ansiblehost=10.200.3.111 + +[gitlabservers] +git.rockylinux.org ansible_host=10.100.1.113 diff --git a/ansible/playbooks/vars/adminusers.yml b/ansible/playbooks/vars/adminusers.yml index d740723..c7f97d1 100644 --- a/ansible/playbooks/vars/adminusers.yml +++ b/ansible/playbooks/vars/adminusers.yml @@ -1,5 +1,5 @@ --- -users: +adminusers: - name: label2 first: Louis last: Abel diff --git a/ansible/playbooks/vars/groups.yml b/ansible/playbooks/vars/groups.yml index 6f54d81..e69d6c5 100644 --- a/ansible/playbooks/vars/groups.yml +++ b/ansible/playbooks/vars/groups.yml @@ -12,3 +12,5 @@ ipagroups: description: Marketing - group: rockyadm description: Rocky Linux Administrators - Only Admin Accounts + - group: gitadm + description: Rocky Linux GitLab Admins diff --git a/ansible/playbooks/vars/ipaclient.yml b/ansible/playbooks/vars/ipaclient.yml index 0c6edac..27ff67a 100644 --- a/ansible/playbooks/vars/ipaclient.yml +++ b/ansible/playbooks/vars/ipaclient.yml @@ -5,3 +5,4 @@ ipaclient_realm: ROCKYLINUX.ORG ipaadmin_principal: admin ipaclient_no_ntp: true ipaclient_mkhomedir: true +ipatype: client diff --git a/ansible/playbooks/vars/users.yml b/ansible/playbooks/vars/users.yml index 16bf485..313cbc5 100644 --- a/ansible/playbooks/vars/users.yml +++ b/ansible/playbooks/vars/users.yml @@ -1,5 +1,5 @@ --- -adminusers: +users: - name: label first: Louis last: Abel