Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of /git/ansible

Browse source
This commit is contained in:
Rick Elrod 2017-07-25 17:52:45 +00:00
commit c1264fe37d
9 changed files with 29 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
inventory/host_vars/darkserver-backend01.stg.phx2.fedoraproject.org
View file

@ -3,8 +3,8 @@ nm: 255.255.255.0
gw: 10.5.126.254
dns: 10.5.126.21
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26
ks_repo: http://10.5.126.23/pub/fedora/linux/releases/26/Server/x86_64/os/
eth0_ip: 10.5.126.124

4
inventory/host_vars/darkserver-web01.stg.phx2.fedoraproject.org
View file

@ -3,8 +3,8 @@ nm: 255.255.255.0
gw: 10.5.126.254
dns: 10.5.126.21
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26
ks_repo: http://10.5.126.23/pub/fedora/linux/releases/26/Server/x86_64/os/
eth0_ip: 10.5.126.92

4
inventory/host_vars/darkserver-web02.stg.phx2.fedoraproject.org
View file

@ -3,8 +3,8 @@ nm: 255.255.255.0
gw: 10.5.126.254
dns: 10.5.126.21
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26
ks_repo: http://10.5.126.23/pub/fedora/linux/releases/26/Server/x86_64/os/
eth0_ip: 10.5.126.120

6
playbooks/groups/releng-compose.yml
View file

@ -74,5 +74,11 @@
- include: "{{ tasks_path }}/2fa_client.yml"
- include: "{{ tasks_path }}/motd.yml"
- name: install skopeo for container management
package:
name: skopeo
state: latest
when: ansible_architecture != "ppc64"
handlers:
- include: "{{ handlers_path }}/restart_services.yml"

4
roles/distgit/files/fedmsg-genacls-config.py
View file

@ -1,4 +0,0 @@
config = {
'genacls.consumer.enabled': True,
'genacls.consumer.delay': 5, # 5 seconds
}

3
roles/distgit/tasks/main.yml
View file

@ -243,7 +243,8 @@
- distgit
- name: install the fedmsg configuration
copy: src=fedmsg-genacls-config.py dest=/etc/fedmsg.d/genacls.py owner=root group=root mode=0644
template: src=fedmsg-genacls-config.py dest=/etc/fedmsg.d/genacls.py
owner=root group=root mode=0644
tags:
- config
- distgit

12
roles/distgit/templates/fedmsg-genacls-config.py Normal file
View file

@ -0,0 +1,12 @@
config = {
'genacls.consumer.enabled': True,
'genacls.consumer.delay': 5, # 5 seconds
# New world
'gitoliteprefix.consumer.enabled': True,
'gitoliteprefix.consumer.delay': 5, # 5 seconds
'gitoliteprefix.consumer.filename': '/var/tmp/gitolite-prefix.txt',
'gitoliteprefix.consumer.fasurl': 'https://admin.fedoraproject.org/accounts',
'gitoliteprefix.consumer.username': "{{ blockerbugs_fas_user }}",
'gitoliteprefix.consumer.password': '{{ blockerbugs_fas_password }}',
}

2
roles/fas_client/files/aliases.template
View file

@ -144,7 +144,7 @@ fudcon-paper: fudcon-cfp
# flock
flockpress: bex,fpl
flockinfo: bex,fpl
flock-staff: bex,fpl,duffy
flock-staff: bex,fpl,duffy,sgallagh
# gnome backups
gnomebackup: backups@gnome.org

3
roles/git/hooks/files/post-receive-alternativearch
View file

@ -17,7 +17,8 @@ import sys
from email.mime.text import MIMEText
abspath = os.path.abspath(os.environ['GIT_DIR'])
PATTERNS = ('+ExclusiveArch:', '+ExcludeArch:', '+%ifarch', '+%ifnarch')
PATTERNS = ('+ExclusiveArch:', '+ExcludeArch:', '+%ifarch', '+%ifnarch',
'-ExclusiveArch:', '-ExcludeArch:', '-%ifarch', '-%ifnarch')
FROM_EMAIL = 'githook-noreply@fedoraproject.org'
TO_MAIL = 'arch-excludes@lists.fedoraproject.org'
CGIT_URL = 'https://src.fedoraproject.org/cgit/%s/commit/?id=%s'