[ansible] One job at a time on aarch64
by Nicolas Chauvet
commit 7cc874c45c2d54fb49b409bb72e601d6d0972eb5
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jun 23 13:13:04 2023 +0200
One job at a time on aarch64
roles/koji_builder/templates/kojid.conf | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf
index e3b09a7..788fc38 100644
--- a/roles/koji_builder/templates/kojid.conf
+++ b/roles/koji_builder/templates/kojid.conf
@@ -3,7 +3,11 @@
; sleeptime=15
; The maximum number of jobs that kojid will handle at a time
+{% if inventory_hostname.startswith('aarch64') %}
+maxjobs=1
+{% else %}
maxjobs=4
+{% endif %}
; The minimum amount of free space (in MBs) required for each build root
; minspace=8192
1 year, 1 month
[ansible] Disable virtlogd
by Nicolas Chauvet
commit 6ab538bb8996a16cf10041209f65e379dad34f76
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jun 23 13:11:34 2023 +0200
Disable virtlogd
roles/koji_builder/tasks/main.yml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index 29c533e..b30000e 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -100,7 +100,7 @@
service: name=virtlogd state=started enabled=yes
tags:
- koji_builder
- when: ansible_architecture != 'armv7l'
+ when: ansible_architecture == 'disabled'
- name: create kojid service override directory
file: path=/etc/systemd/system/kojid.service.d state=directory
1 year, 1 month
[ansible] Drop ntp from koji_builder role
by Nicolas Chauvet
commit 6984625b3bf7a43c0aa98a77b5ee254b579d8be9
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jun 23 12:30:59 2023 +0200
Drop ntp from koji_builder role
roles/koji_builder/tasks/main.yml | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index 73cf0e3..29c533e 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -80,8 +80,6 @@
- koji-containerbuild-builder
- strace
- mock
- - ntp
- - ntpdate
- rsyslog
- audit
- pycdio
1 year, 1 month
[ansible] Switch to ansible_ifcfg_blocklist: true
by Nicolas Chauvet
commit 49913187aff1f0bb311877e0f6900195fabe5cba
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jun 23 12:54:18 2023 +0200
Switch to ansible_ifcfg_blocklist: true
inventory/group_vars/buildarm | 2 +-
inventory/group_vars/buildhw_aarch64 | 2 +-
inventory/group_vars/buildhw_armv7 | 2 +-
inventory/group_vars/buildvm_aarch64 | 2 +-
inventory/group_vars/buildvm_ppc64 | 2 +-
inventory/group_vars/buildvm_ppc64le | 2 +-
inventory/group_vars/home_arm | 2 +-
inventory/group_vars/linaro | 2 +-
inventory/group_vars/osuosl | 2 +-
inventory/group_vars/scaleway_c1 | 2 +-
inventory/group_vars/sign_vault | 2 +-
inventory/host_vars/aarch64-10.home.rpmfusion.net | 1 +
.../aarch64-jetson-tx1.home.rpmfusion.net | 1 +
inventory/host_vars/buildvm-05.virt.rpmfusion.net | 2 +-
inventory/host_vars/buildvm-06.virt.rpmfusion.net | 2 +-
inventory/host_vars/buildvm-07.virt.rpmfusion.net | 1 +
inventory/host_vars/buildvm-08.virt.rpmfusion.net | 2 +-
inventory/host_vars/hv01.online.rpmfusion.net | 2 +-
inventory/host_vars/srv03.kwizart.net | 2 +-
19 files changed, 19 insertions(+), 16 deletions(-)
---
diff --git a/inventory/group_vars/buildarm b/inventory/group_vars/buildarm
index 2756f5c..1aeba2d 100644
--- a/inventory/group_vars/buildarm
+++ b/inventory/group_vars/buildarm
@@ -1,7 +1,7 @@
host_group: kojibuilder
fas_client_groups: sysadmin-build
sudoers: "{{ private }}/files/sudo/00releng-sudoers"
-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true
koji_hub_nfs: "rpmfusion_koji"
diff --git a/inventory/group_vars/buildhw_aarch64 b/inventory/group_vars/buildhw_aarch64
index 1325793..0932134 100644
--- a/inventory/group_vars/buildhw_aarch64
+++ b/inventory/group_vars/buildhw_aarch64
@@ -2,7 +2,7 @@
host_group: kojibuilder
fas_client_groups: sysadmin-build
sudoers: "{{ private }}/files/sudo/00releng-sudoers"
-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true
koji_hub_nfs: "rpmfusion_koji"
diff --git a/inventory/group_vars/buildhw_armv7 b/inventory/group_vars/buildhw_armv7
index 2756f5c..1aeba2d 100644
--- a/inventory/group_vars/buildhw_armv7
+++ b/inventory/group_vars/buildhw_armv7
@@ -1,7 +1,7 @@
host_group: kojibuilder
fas_client_groups: sysadmin-build
sudoers: "{{ private }}/files/sudo/00releng-sudoers"
-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true
koji_hub_nfs: "rpmfusion_koji"
diff --git a/inventory/group_vars/buildvm_aarch64 b/inventory/group_vars/buildvm_aarch64
index 1325793..0932134 100644
--- a/inventory/group_vars/buildvm_aarch64
+++ b/inventory/group_vars/buildvm_aarch64
@@ -2,7 +2,7 @@
host_group: kojibuilder
fas_client_groups: sysadmin-build
sudoers: "{{ private }}/files/sudo/00releng-sudoers"
-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true
koji_hub_nfs: "rpmfusion_koji"
diff --git a/inventory/group_vars/buildvm_ppc64 b/inventory/group_vars/buildvm_ppc64
index 1325793..0932134 100644
--- a/inventory/group_vars/buildvm_ppc64
+++ b/inventory/group_vars/buildvm_ppc64
@@ -2,7 +2,7 @@
host_group: kojibuilder
fas_client_groups: sysadmin-build
sudoers: "{{ private }}/files/sudo/00releng-sudoers"
-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true
koji_hub_nfs: "rpmfusion_koji"
diff --git a/inventory/group_vars/buildvm_ppc64le b/inventory/group_vars/buildvm_ppc64le
index 1325793..0932134 100644
--- a/inventory/group_vars/buildvm_ppc64le
+++ b/inventory/group_vars/buildvm_ppc64le
@@ -2,7 +2,7 @@
host_group: kojibuilder
fas_client_groups: sysadmin-build
sudoers: "{{ private }}/files/sudo/00releng-sudoers"
-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true
koji_hub_nfs: "rpmfusion_koji"
diff --git a/inventory/group_vars/home_arm b/inventory/group_vars/home_arm
index a368ce7..c5ab96a 100644
--- a/inventory/group_vars/home_arm
+++ b/inventory/group_vars/home_arm
@@ -1,2 +1,2 @@
datacenter: home
-ansible_ifcfg_blacklist: True
+ansible_ifcfg_blocklist: true
diff --git a/inventory/group_vars/linaro b/inventory/group_vars/linaro
index d0169df..2383da8 100644
--- a/inventory/group_vars/linaro
+++ b/inventory/group_vars/linaro
@@ -1,3 +1,3 @@
datacenter: linaro
-ansible_ifcfg_blacklist: True
+ansible_ifcfg_blocklist: true
gw: 192.168.1.1
diff --git a/inventory/group_vars/osuosl b/inventory/group_vars/osuosl
index 332f3db..7f3a68a 100644
--- a/inventory/group_vars/osuosl
+++ b/inventory/group_vars/osuosl
@@ -1,2 +1,2 @@
datacenter: osuosl
-ansible_ifcfg_blacklist: True
+ansible_ifcfg_blocklist: true
diff --git a/inventory/group_vars/scaleway_c1 b/inventory/group_vars/scaleway_c1
index 57e6063..10a4eb6 100644
--- a/inventory/group_vars/scaleway_c1
+++ b/inventory/group_vars/scaleway_c1
@@ -1,2 +1,2 @@
datacenter: scaleway
-ansible_ifcfg_blacklist: True
+ansible_ifcfg_blocklist: true
diff --git a/inventory/group_vars/sign_vault b/inventory/group_vars/sign_vault
index 8b63ff9..72763a6 100644
--- a/inventory/group_vars/sign_vault
+++ b/inventory/group_vars/sign_vault
@@ -2,4 +2,4 @@
freezes: true
postfix_group: sign
host_group: sign
-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true
diff --git a/inventory/host_vars/aarch64-10.home.rpmfusion.net b/inventory/host_vars/aarch64-10.home.rpmfusion.net
index 6c5a34c..1ec67c5 100644
--- a/inventory/host_vars/aarch64-10.home.rpmfusion.net
+++ b/inventory/host_vars/aarch64-10.home.rpmfusion.net
@@ -1,2 +1,3 @@
---
datacenter: home
+ansible_ifcfg_blocklist: true
diff --git a/inventory/host_vars/aarch64-jetson-tx1.home.rpmfusion.net b/inventory/host_vars/aarch64-jetson-tx1.home.rpmfusion.net
index 6c5a34c..1ec67c5 100644
--- a/inventory/host_vars/aarch64-jetson-tx1.home.rpmfusion.net
+++ b/inventory/host_vars/aarch64-jetson-tx1.home.rpmfusion.net
@@ -1,2 +1,3 @@
---
datacenter: home
+ansible_ifcfg_blocklist: true
diff --git a/inventory/host_vars/buildvm-05.virt.rpmfusion.net b/inventory/host_vars/buildvm-05.virt.rpmfusion.net
index 75870da..f47c97d 100644
--- a/inventory/host_vars/buildvm-05.virt.rpmfusion.net
+++ b/inventory/host_vars/buildvm-05.virt.rpmfusion.net
@@ -1,6 +1,6 @@
---
datacenter: virt
-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true
#
# We need to mount koji storage rw here so run_root can work.
diff --git a/inventory/host_vars/buildvm-06.virt.rpmfusion.net b/inventory/host_vars/buildvm-06.virt.rpmfusion.net
index 75870da..f47c97d 100644
--- a/inventory/host_vars/buildvm-06.virt.rpmfusion.net
+++ b/inventory/host_vars/buildvm-06.virt.rpmfusion.net
@@ -1,6 +1,6 @@
---
datacenter: virt
-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true
#
# We need to mount koji storage rw here so run_root can work.
diff --git a/inventory/host_vars/buildvm-07.virt.rpmfusion.net b/inventory/host_vars/buildvm-07.virt.rpmfusion.net
index 4650404..f47c97d 100644
--- a/inventory/host_vars/buildvm-07.virt.rpmfusion.net
+++ b/inventory/host_vars/buildvm-07.virt.rpmfusion.net
@@ -1,5 +1,6 @@
---
datacenter: virt
+ansible_ifcfg_blocklist: true
#
# We need to mount koji storage rw here so run_root can work.
diff --git a/inventory/host_vars/buildvm-08.virt.rpmfusion.net b/inventory/host_vars/buildvm-08.virt.rpmfusion.net
index 7d06380..f47c97d 100644
--- a/inventory/host_vars/buildvm-08.virt.rpmfusion.net
+++ b/inventory/host_vars/buildvm-08.virt.rpmfusion.net
@@ -1,6 +1,6 @@
---
datacenter: virt
-ansible_ifcfg_blacklist: True
+ansible_ifcfg_blocklist: true
#
# We need to mount koji storage rw here so run_root can work.
diff --git a/inventory/host_vars/hv01.online.rpmfusion.net b/inventory/host_vars/hv01.online.rpmfusion.net
index 65a774b..732496c 100644
--- a/inventory/host_vars/hv01.online.rpmfusion.net
+++ b/inventory/host_vars/hv01.online.rpmfusion.net
@@ -1,6 +1,6 @@
---
-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true
freezes: true
dns: 62.210.16.6
gw: 195.154.185.1
diff --git a/inventory/host_vars/srv03.kwizart.net b/inventory/host_vars/srv03.kwizart.net
index 6584dd3..9daa237 100644
--- a/inventory/host_vars/srv03.kwizart.net
+++ b/inventory/host_vars/srv03.kwizart.net
@@ -1,5 +1,5 @@
---
-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true
freezes: true
1 year, 1 month
[ansible] Update sudo tasks
by Nicolas Chauvet
commit 4e0a914b8f38d0bc8018d4f0c409b76cf54edd0e
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jun 23 12:21:23 2023 +0200
Update sudo tasks
roles/sudo/tasks/main.yml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/roles/sudo/tasks/main.yml b/roles/sudo/tasks/main.yml
index aede6ad..8dffd37 100644
--- a/roles/sudo/tasks/main.yml
+++ b/roles/sudo/tasks/main.yml
@@ -8,7 +8,7 @@
#
- name: setup /etc/sudoers.d/01-sysadmin-main
copy: src="{{ private }}/files/sudo/sysadmin-main" dest=/etc/sudoers.d/01-sysadmin-main owner=root group=root mode=0600
- when: sudoers_main is not defined
+ when: "sudoers_main is not defined and (primary_auth_source | default('fas')) == 'fas'"
tags:
- config
- sudo
@@ -44,6 +44,7 @@
- "{{ private }}/files/sudo/{{ ansible_hostname }}-sudoers"
- "{{ private }}/files/sudo/{{ ansible_domain }}-sudoers"
- "{{ private }}/files/sudo/default"
+ when: inventory_hostname.startswith('batcave')
tags:
- config
- sudo
1 year, 1 month
[ansible] Update nsswitch
by Nicolas Chauvet
commit 5712caa2175c757caa87a8b2d5cce4582feb9e35
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jun 23 12:00:32 2023 +0200
Update nsswitch
roles/fas_client/files/nsswitch.conf | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/roles/fas_client/files/nsswitch.conf b/roles/fas_client/files/nsswitch.conf
index 8da4a65..335af38 100644
--- a/roles/fas_client/files/nsswitch.conf
+++ b/roles/fas_client/files/nsswitch.conf
@@ -21,12 +21,12 @@
# [NOTFOUND=return] Stop searching if not found so far
#
-passwd: db files
+passwd: db files systemd
shadow: db files
-group: db files
+group: db files systemd
#hosts: db files nisplus nis dns
-hosts: files dns myhostname
+hosts: files myhostname resolve [!UNAVAIL=return] dns
bootparams: nisplus [NOTFOUND=return] files
1 year, 1 month
[ansible] Drop arm builders
by Nicolas Chauvet
commit 6f3d0661a658a9f6fdff35ebc53b5d0f177c9e04
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jun 23 11:33:12 2023 +0200
Drop arm builders
inventory/builders | 30 +-----------------------------
1 files changed, 1 insertions(+), 29 deletions(-)
---
diff --git a/inventory/builders b/inventory/builders
index a336fe9..b521a29 100644
--- a/inventory/builders
+++ b/inventory/builders
@@ -4,7 +4,7 @@
aarch64-03.linaro.rpmfusion.net ansible_user=fedora ansible_become=yes ansible_python_interpreter=/usr/bin/python3
aarch64-04.linaro.rpmfusion.net ansible_user=fedora ansible_become=yes ansible_python_interpreter=/usr/bin/python3
aarch64-jetson-tx1.home.rpmfusion.net
-aarch64-10.home.rpmfusion.net
+#aarch64-10.home.rpmfusion.net
[buildvm]
buildvm-01.online.rpmfusion.net
@@ -14,9 +14,6 @@ buildvm-02.online.rpmfusion.net
[buildvm_aarch64]
-[buildvm_arm]
-arm-jetson-tx1.home.rpmfusion.net
-
[buildhw]
buildvm-03.online.rpmfusion.net
buildvm-05.virt.rpmfusion.net
@@ -30,10 +27,6 @@ buildvm-08.virt.rpmfusion.net
buildppcle-01.osuosl.rpmfusion.net ansible_user=fedora ansible_become=yes
buildppcle-02.osuosl.rpmfusion.net ansible_user=fedora ansible_become=yes
-[buildhw_armv7:children]
-home_arm
-scaleway_c1
-
[bkernel]
@@ -44,38 +37,17 @@ buildhw_aarch64
buildhw_ppc64
buildhw_ppc64le
-[home:children]
-home_arm
-
-[scaleway_c1]
-#arm-builder01.scaleway.rpmfusion.net
-#arm-builder02.scaleway.rpmfusion.net
-#arm-builder03.scaleway.rpmfusion.net
-#arm-builder04.scaleway.rpmfusion.net
-
-[home_arm]
-#arm-builder09.home.rpmfusion.net
-arm-builder10.home.rpmfusion.net
-arm-builder11.home.rpmfusion.net
-#arm-builder12.home.rpmfusion.net
-arm-jetson-tk1.home.rpmfusion.net
-arm-jetson-tx1.home.rpmfusion.net
-arm-pi4.home.rpmfusion.net
-
-
[builders:children]
buildhw
buildvm
[buildhw:children]
-buildhw_armv7
buildhw_ppc64
buildhw_ppc64le
buildhw_aarch64
[buildvm:children]
buildvm_aarch64
-buildvm_arm
[builders:vars]
ansible_python_interpreter=/usr/bin/python3
1 year, 1 month
[ansible] Update mailman playbook
by Nicolas Chauvet
commit 19ecf4c0635526435c260f0075a8df686213beb8
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jun 23 11:26:14 2023 +0200
Update mailman playbook
playbooks/groups/mailman.yml | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml
index 5c90468..7d146a4 100644
--- a/playbooks/groups/mailman.yml
+++ b/playbooks/groups/mailman.yml
@@ -15,13 +15,13 @@
- "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml"
roles:
- - base
- - rkhunter
- - nagios_client
+# - base
+# - rkhunter
+# - nagios_client
- hosts
- fas_client
- - collectd/base
- - sudo
+# - collectd/base
+# - sudo
- spamassassin
- mod_wsgi
@@ -55,6 +55,7 @@
- name: setup the database
hosts: mailman_db-stg:mailman_db
gather_facts: no
+ user: root
become: yes
become_user: postgres
become_method: su
@@ -97,7 +98,7 @@
mailman_hyperkitty_admin_db_pass: "{{ mailman_hk_admin_db_pass }}"
mailman_hyperkitty_db_pass: "{{ mailman_hk_db_pass }}"
mailman_hyperkitty_cookie_key: "{{ mailman_hk_cookie_key }}"
- - fedmsg/base
+# - fedmsg/base
tasks:
- name: install more needed packages
1 year, 1 month
[ansible] Update mailman task
by Nicolas Chauvet
commit c7414786edf7e5a8b1bbc5b0f590541a8554be78
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jun 23 11:25:32 2023 +0200
Update mailman task
roles/mailman/tasks/main.yml | 60 +++++++++++++++++++++--------------------
1 files changed, 31 insertions(+), 29 deletions(-)
---
diff --git a/roles/mailman/tasks/main.yml b/roles/mailman/tasks/main.yml
index bdf5b23..d98bf3f 100644
--- a/roles/mailman/tasks/main.yml
+++ b/roles/mailman/tasks/main.yml
@@ -8,7 +8,7 @@
# TODO: switch to the sefcontext module when we update Ansible to 2.2+
#
- name: install semanage
- yum: pkg=policycoreutils-python state=present
+ package: name=policycoreutils-python state=present
tags:
- mailman
- selinux
@@ -86,7 +86,7 @@
tags: mailman
- name: install GPG to validate the key
- yum: state=present name=gnupg
+ package: state=present name=gnupg
tags: mailman
- name: add the GPG key
@@ -94,27 +94,28 @@
tags: mailman
- name: install needed packages
- yum: pkg={{ item }} state=present
- with_items:
- - python-psycopg2
- - python34-psycopg2
- - hyperkitty
- - hyperkitty-selinux
- - postorius
- - memcached
- - python-pylibmc
- - python-django-haystack-xapian
- - yum-plugin-post-transaction-actions
- # to run the test suite:
- - python-beautifulsoup4
- - python-mock
- - python-whoosh
- - python-tox
- - python-vcrpy
- # scripts
- - python34-PyYAML
- # mailman soft dep to convert html to plaintext
- - lynx
+ package:
+ name:
+ - python-psycopg2
+ - python34-psycopg2
+ - hyperkitty
+ - hyperkitty-selinux
+ - postorius
+ - memcached
+ - python-pylibmc
+ - python-django-haystack-xapian
+ - yum-plugin-post-transaction-actions
+ # to run the test suite:
+ - python-beautifulsoup4
+ - python-mock
+ - python-whoosh
+ - python-tox
+ - python-vcrpy
+ # scripts
+ - python34-PyYAML
+ # mailman soft dep to convert html to plaintext
+ - lynx
+ state: present
tags:
- packages
- mailman
@@ -131,7 +132,7 @@
tags: mailman
- name: install the mailman3 fedmsg plugin rpm
- yum: pkg=mailman3-fedmsg-plugin
+ package: name=mailman3-fedmsg-plugin
notify: restart mailman3
when: ansible_distribution == 'RedHat'
tags: mailman
@@ -144,11 +145,12 @@
notify: restart mailman3
- name: install packages
- yum: pkg={{ item }} state=present
- with_items:
- - mailman3
- - mailman3-selinux
- - mailman3-hyperkitty
+ package:
+ name:
+ - mailman3
+ - mailman3-selinux
+ - mailman3-hyperkitty
+ state: present
tags:
- packages
- mailman
1 year, 1 month