[ansible] Add some options for rhel-8
by Nicolas Chauvet
commit c8472ea0ecef29596e42a16ab57ea9b2863fa681
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Nov 21 12:47:42 2018 +0100
Add some options for rhel-8
.../koji_builder/files/builders/site-defaults.cfg | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/roles/koji_builder/files/builders/site-defaults.cfg b/roles/koji_builder/files/builders/site-defaults.cfg
index bd3b39c..d7625fc 100644
--- a/roles/koji_builder/files/builders/site-defaults.cfg
+++ b/roles/koji_builder/files/builders/site-defaults.cfg
@@ -3,3 +3,6 @@ config_opts['plugin_conf']['ccache_enable'] = False
config_opts['dnf_common_opts'] = ['--setopt=install_weak_deps=0']
config_opts['http_proxy'] = 'http://proxy:3128'
config_opts['nosync'] = True
+config_opts['bootstrap_chroot_additional_packages'] = []
+config_opts['bootstrap_module_enable'] = []
+config_opts['bootstrap_module_install'] = []
6 years, 1 month
[ansible] Refresh fas_server
by Nicolas Chauvet
commit a4b704406dd78699b736676bbe00758c2e09333d
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Nov 20 17:29:31 2018 +0100
Refresh fas_server
roles/fas_server/tasks/main.yml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/roles/fas_server/tasks/main.yml b/roles/fas_server/tasks/main.yml
index 04ccfcf..592e62f 100644
--- a/roles/fas_server/tasks/main.yml
+++ b/roles/fas_server/tasks/main.yml
@@ -2,9 +2,10 @@
# Tasks to set up fas_server
- name: install needed packages
- yum: pkg={{ item }} state=installed
+ package: name={{ item }} state=present
with_items:
- fas
+ - fas-plugin-yubikey
- python-turbojson
- python-tgcaptcha
- httpd
@@ -16,8 +17,7 @@
- fas
- name: install needed packages
- when: env == "staging"
- yum: pkg={{ item }} state=installed
+ package: name={{ item }} state=present
with_items:
- krb5-workstation
- python-requests-kerberos
6 years, 1 month
[ansible] Add an el8 branch
by Nicolas Chauvet
commit 3d875904071f42112721f88a665642c3160218f6
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Nov 20 17:28:04 2018 +0100
Add an el8 branch
roles/distgit/templates/genacls.pkgdb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/roles/distgit/templates/genacls.pkgdb b/roles/distgit/templates/genacls.pkgdb
index 39657db..6f91a70 100755
--- a/roles/distgit/templates/genacls.pkgdb
+++ b/roles/distgit/templates/genacls.pkgdb
@@ -28,7 +28,7 @@ if __name__ == '__main__':
# Give them the git branch eqiv until pkgdb follows suite
ACTIVE = {
'EL-5': 'el5', 'el5': 'el5', 'el6': 'el6', 'EL-6': 'el6',
- 'el7': 'el7',
+ 'el7': 'el7', 'el8': 'el8',
'F-11': 'f11', 'F-12': 'f12', 'F-13': 'f13', 'f14': 'f14', 'f15':
'f15', 'f16': 'f16', 'f17': 'f17', 'f18': 'f18', 'f19': 'f19',
'f20': 'f20', 'f21': 'f21', 'f22': 'f22', 'f23': 'f23', 'f24': 'f24',
6 years, 1 month
[ansible] Reduce the number of fas wsgi process
by Nicolas Chauvet
commit 9041229151cb289432bd7e59f303885b94e6fec5
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Nov 6 15:07:28 2018 +0100
Reduce the number of fas wsgi process
inventory/group_vars/fas | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/inventory/group_vars/fas b/inventory/group_vars/fas
index a884380..bb73613 100644
--- a/inventory/group_vars/fas
+++ b/inventory/group_vars/fas
@@ -11,7 +11,7 @@ ks_repo: http://mirror.centos.org/centos/6/os/x86_64/
# the host_vars/$hostname file
wsgi_fedmsg_service: fas
-wsgi_procs: 40
+wsgi_procs: 8
wsgi_threads: 1
tcp_ports: [ 80, 873, 8443, 8444 ]
6 years, 1 month
[ansible] Sync fas_server with fedora
by Nicolas Chauvet
commit 68ae4e31a99c1a2dd7a24653f490fade74ff370e
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Nov 6 15:02:12 2018 +0100
Sync fas_server with fedora
roles/fas_server/templates/fas.cfg.j2 | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/roles/fas_server/templates/fas.cfg.j2 b/roles/fas_server/templates/fas.cfg.j2
index 39b3db5..5d40eee 100644
--- a/roles/fas_server/templates/fas.cfg.j2
+++ b/roles/fas_server/templates/fas.cfg.j2
@@ -79,7 +79,7 @@ username_blacklist = "abuse,accounts,adm,admin,amanda,apache,askfedora,asterisk,
email_domain_blacklist = "{{ fas_blocked_emails }}"
# Valid SSH Key
-valid_ssh_key = "rsa,ssh-rsa,ecdsa,ecdsa-sha2"
+valid_ssh_key = "rsa,ssh-rsa,ssh-ed25519,ecdsa-sha2-nistp256"
# admingroup has powers to change anything in the fas UI
admingroup = 'accounts'
@@ -253,7 +253,7 @@ gpghome = "/etc/fas-gpg"
# a gpg key registered. It's currently broken
gpg_fingerprint = "0FC4 A51E 379A C050 5112 8DF5 94D7 5B22 5B01 F801"
#gpg_passphrase = "{{ fasGpgPassphrase }}"
-gpg_keyserver = "hkp://keys.fedoraproject.org"
+gpg_keyserver = "hkp://subkeys.pgp.net"
[/rpmfusion-server-ca.cert]
static_filter.on = True
6 years, 1 month
[ansible] Install oz everywhere
by Nicolas Chauvet
commit 072f51549323414605b421847c42305c48e5fe7b
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Nov 6 13:54:17 2018 +0100
Install oz everywhere
roles/koji_builder/tasks/main.yml | 21 ---------------------
1 files changed, 0 insertions(+), 21 deletions(-)
---
diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index 3152c30..69af3c0 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -95,28 +95,7 @@
- pykickstart
tags:
- koji_builder
- when: ansible_architecture != 'armv7l'
-- name: add pkgs (armv7l)
- dnf: state=present pkg={{ item }}
- with_items:
- - yum-utils
- - koji-builder
- - python2-koji
- - python-osbs-client
- - koji-containerbuild-builder
- - strace
- - mock
- - ntp
- - ntpdate
- - rsyslog
- - audit
- - pycdio
- - python-kickstart
- - pykickstart
- tags:
- - koji_builder
- when: ansible_architecture == 'armv7l'
- name: enable virtlogd service
service: name=virtlogd state=started enabled=yes
6 years, 1 month
[ansible] Fix use copy fir site-defaults.cfg
by Nicolas Chauvet
commit a7d7ffef041ddd06fb41a3a9a0f9affe2aa92769
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Nov 6 13:19:38 2018 +0100
Fix use copy fir site-defaults.cfg
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 66c798d..3152c30 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -212,7 +212,7 @@
- koji_builder
- name: mock site-defaults.cfg
- file: src=builders/site-defaults.cfg dest=/etc/mock/site-defaults.cfg mode=0644 owner=root group=mock
+ copy: src=builders/site-defaults.cfg dest=/etc/mock/site-defaults.cfg mode=0644 owner=root group=mock
when: not inventory_hostname.startswith('bkernel')
tags:
- koji_builder
6 years, 1 month
[ansible] remove builder_repo everwhere
by Nicolas Chauvet
commit 43d831a157fae45deca9b117160c419017fae9fd
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Nov 6 13:03:24 2018 +0100
remove builder_repo everwhere
playbooks/groups/bodhi-backend.yml | 1 -
playbooks/groups/koji-hub.yml | 1 -
roles/autosigner/meta/main.yml | 1 -
roles/koji_builder/meta/main.yml | 2 +-
4 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml
index 9473c8a..e6c8bf9 100644
--- a/playbooks/groups/bodhi-backend.yml
+++ b/playbooks/groups/bodhi-backend.yml
@@ -27,7 +27,6 @@
- nagios/client
- collectd/base
- hosts
- - builder_repo
- fas_client
- sudo
- rkhunter
diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml
index 40854fe..2e33f11 100644
--- a/playbooks/groups/koji-hub.yml
+++ b/playbooks/groups/koji-hub.yml
@@ -26,7 +26,6 @@
- nagios/client
- hosts
- fas_client
- - builder_repo
- collectd/base
- apache
- fedmsg/base
diff --git a/roles/autosigner/meta/main.yml b/roles/autosigner/meta/main.yml
index a862819..c283e28 100644
--- a/roles/autosigner/meta/main.yml
+++ b/roles/autosigner/meta/main.yml
@@ -1,4 +1,3 @@
---
dependencies:
- - { role: builder_repo }
- { role: hosts }
diff --git a/roles/koji_builder/meta/main.yml b/roles/koji_builder/meta/main.yml
index dd51899..c283e28 100644
--- a/roles/koji_builder/meta/main.yml
+++ b/roles/koji_builder/meta/main.yml
@@ -1,3 +1,3 @@
---
dependencies:
- - { role: builder_repo }
+ - { role: hosts }
6 years, 1 month
[ansible] Remove deprecated builder_repo role
by Nicolas Chauvet
commit 790cb94c119612329b4197323e1c7fb3598de54d
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Nov 6 13:01:26 2018 +0100
Remove deprecated builder_repo role
.../builder_repo/files/builder-infrastructure.repo | 6 ------
roles/builder_repo/tasks/main.yml | 2 --
2 files changed, 0 insertions(+), 8 deletions(-)
6 years, 1 month