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

Merge branch 'master' of ssh://pagure.io/fedora-infra/ansible

Browse source
This commit is contained in:
Stephen Smoogen 2020-05-25 17:12:49 -04:00
commit 955ac58aab
8 changed files with 81 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

13
inventory/host_vars/mbs-backend01.iad2.fedoraproject.org Normal file
View file

@ -0,0 +1,13 @@
---
nm: 255.255.255.0
gw: 10.3.169.254
dns: 10.3.163.33
ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-7-iad2
ks_repo: http://10.3.163.35/repo/rhel/RHEL7-x86_64/
eth0_ip: 10.3.169.108
volgroup: /dev/vg_guests
vmhost: bvmhost-x86-03.iad2.fedoraproject.org
datacenter: iad2

13
inventory/host_vars/mbs-frontend01.iad2.fedoraproject.org Normal file
View file

@ -0,0 +1,13 @@
---
nm: 255.255.255.0
gw: 10.3.169.254
dns: 10.3.163.33
ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-7
ks_repo: http://10.3.163.35/repo/rhel/RHEL7-x86_64/
eth0_ip: 10.3.169.109
volgroup: /dev/vg_guests
vmhost: bvmhost-x86-04.iad2.fedoraproject.org
datacenter: iad2

12
inventory/host_vars/sign-bridge01.iad2.fedoraproject.org Normal file
View file

@ -0,0 +1,12 @@
---
nm: 255.255.255.0
gw: 10.3.169.254
dns: 10.3.163.33
ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-8-iad2
ks_repo: http://10.3.163.35/repo/rhel/RHEL8-x86_64/
volgroup: /dev/vg_guests
vmhost: bvmhost-x86-03.iad2.fedoraproject.org
datacenter: iad2
eth0_ip: 10.3.169.120

6
inventory/inventory
View file

@ -170,6 +170,7 @@ mailman01.stg.phx2.fedoraproject.org
[mbs_frontend]
mbs-frontend01.phx2.fedoraproject.org
mbs-frontend01.iad2.fedoraproject.org
mbs-frontend02.phx2.fedoraproject.org
[mbs_frontend_stg]
@ -178,6 +179,7 @@ mbs-frontend02.stg.phx2.fedoraproject.org
[mbs_backend]
mbs-backend01.phx2.fedoraproject.org
mbs-backend01.iad2.fedoraproject.org
[mbs_backend_stg]
mbs-backend01.stg.phx2.fedoraproject.org
@ -199,6 +201,7 @@ bodhi-backend01.stg.phx2.fedoraproject.org
[sign_bridge]
sign-bridge01.phx2.fedoraproject.org
sign-bridge01.iad2.fedoraproject.org
sign-bridge01.stg.phx2.fedoraproject.org
#
# sign vault servers don't listen to ssh by default.
@ -1314,6 +1317,8 @@ kojipkgs01.iad2.fedoraproject.org
kojipkgs02.iad2.fedoraproject.org
log01.iad2.fedoraproject.org
loopabull01.iad2.fedoraproject.org
mbs-frontend01.iad2.fedoraproject.org
mbs-backend01.iad2.fedoraproject.org
memcached01.iad2.fedoraproject.org
mm-frontend01.iad2.fedoraproject.org
mm-frontend-checkin01.iad2.fedoraproject.org
@ -1347,6 +1352,7 @@ rabbitmq02.iad2.fedoraproject.org
rabbitmq03.iad2.fedoraproject.org
compose-rawhide01.iad2.fedoraproject.org
secondary01.iad2.fedoraproject.org
sign-bridge01.iad2.fedoraproject.org
sundries01.iad2.fedoraproject.org
tang01.iad2.fedoraproject.org
tang02.iad2.fedoraproject.org

2
playbooks/groups/pkgs.yml
View file

@ -62,7 +62,7 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles:
- { role: gitolite/base, when: env != "staging" and datacenter != iad2}
- { role: gitolite/base, when: env != "staging" and datacenter != "iad2"}
- gitolite/check_fedmsg_hooks
- { role: git/make_checkout_seed, when: env != "staging" }
- git/hooks

26
roles/distgit/pagure/tasks/main.yml
View file

@ -14,7 +14,7 @@
- libsemanage-python
- python-fedora-flask
- pagure-dist-git
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
tags:
- pagure
- packages
@ -32,7 +32,7 @@
- python3-libsemanage
- python3-fedora-flask
- pagure-dist-git
when: env == "staging"
when: env == "staging" or datacenter == "iad2"
tags:
- pagure
- packages
@ -86,7 +86,7 @@
etype: group
permissions: r
state: present
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
# Set-up Pagure
@ -137,7 +137,7 @@
- name: create the database scheme
command: /usr/bin/python2 /usr/share/pagure/pagure_createdb.py
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
changed_when: "1 != 1"
environment:
PAGURE_CONFIG: /etc/pagure/pagure.cfg
@ -147,7 +147,7 @@
- name: create the database scheme
command: /usr/bin/python3 /usr/share/pagure/pagure_createdb.py
when: env == "staging"
when: env == "staging" or datacenter == "iad2"
changed_when: "1 != 1"
environment:
PAGURE_CONFIG: /etc/pagure/pagure.cfg
@ -325,7 +325,7 @@
job: /usr/bin/python2 /usr/libexec/pagure-dist-git/pagure_poc.py /srv/cache/extras
cron_file: pagure-poc
state: present
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
tags:
- pagure
@ -337,7 +337,7 @@
job: /usr/bin/python2 /usr/libexec/pagure-dist-git/pagure_bz.py /srv/cache/extras
cron_file: pagure-bz
state: present
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
tags:
- pagure
@ -349,7 +349,7 @@
job: /usr/bin/python2 /usr/libexec/pagure-dist-git/pagure_owner_alias.py /srv/cache/extras
cron_file: pagure-owner-alias
state: present
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
tags:
- pagure
@ -362,7 +362,7 @@
job: /usr/bin/python3 /usr/libexec/pagure-dist-git/pagure_poc.py /srv/cache/extras
cron_file: pagure-poc
state: present
when: env == "staging"
when: env == "staging" or datacenter == "iad2"
tags:
- pagure
@ -374,7 +374,7 @@
job: /usr/bin/python3 /usr/libexec/pagure-dist-git/pagure_bz.py /srv/cache/extras
cron_file: pagure-bz
state: present
when: env == "staging"
when: env == "staging" or datacenter == "iad2"
tags:
- pagure
@ -386,7 +386,7 @@
job: /usr/bin/python3 /usr/libexec/pagure-dist-git/pagure_owner_alias.py /srv/cache/extras
cron_file: pagure-owner-alias
state: present
when: env == "staging"
when: env == "staging" or datacenter == "iad2"
tags:
- pagure
@ -396,7 +396,7 @@
package: name={{ item }} state=present
with_items:
- python2-fedora-messaging
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
tags:
- pagure
- fedora-messaging
@ -405,7 +405,7 @@
package: name={{ item }} state=present
with_items:
- fedora-messaging
when: env == "staging"
when: env == "staging" or datacenter == "iad2"
tags:
- pagure
- fedora-messaging

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

@ -15,7 +15,7 @@
- python-fedmsg-genacls
- /usr/sbin/semanage
- mod_auth_openidc
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
tags:
- distgit
@ -28,7 +28,7 @@
stream=2.3
profiles=
state=enabled
when: env == "staging"
when: env == "staging" or datacenter == "iad2"
- name: install the needed packages
package: name={{item}} state=present
@ -39,7 +39,7 @@
- mod_auth_gssapi
- /usr/sbin/semanage
- mod_auth_openidc
when: env == "staging"
when: env == "staging" or datacenter == "iad2"
tags:
- distgit
@ -226,7 +226,7 @@
# This is the permission management for package maintainers, using Gitolite.
- name: create the /var/log/gitolite directory
file: path=/var/log/gitolite owner=root group=packager state=directory mode=2775
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
tags:
- distgit
@ -243,42 +243,42 @@
group=gen-acls
shell=/bin/bash
home=/srv/git
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
tags:
- distgit
- name: create the /etc/gitolite/conf directory
file: path=/etc/gitolite/conf owner=pagure group=pagure
state=directory mode=0755
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
tags:
- distgit
- name: create the /etc/gitolite/logs directory
file: path=/etc/gitolite/logs owner=pagure group=packager
state=directory mode=0775
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
tags:
- distgit
- name: create the /etc/gitolite/local/VREF directory
file: path=/etc/gitolite/local/VREF owner=pagure group=packager
state=directory mode=0775
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
tags:
- distgit
- name: create /etc/gitolite/gitolite.rc
template: src=gitolite.rc dest=/etc/gitolite/gitolite.rc
owner=root group=root mode=0755
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
tags:
- distgit
- name: Create the rpms symlink (should not be needed, might still be used by some old scripts)
command: ln -s /srv/git/repositories/ /srv/git/rpms
creates=/srv/git/rpms
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
tags:
- config
- distgit
@ -286,7 +286,7 @@
- name: Create the gitolite.rc symlink
command: ln -s /etc/gitolite/gitolite.rc /srv/git/.gitolite.rc
creates=/srv/git/.gitolite.rc
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
tags:
- config
- distgit
@ -294,7 +294,7 @@
- name: Create the gitolite configuration symlink
command: ln -s /etc/gitolite/ /srv/git/.gitolite
creates=/srv/git/.gitolite
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
tags:
- config
- distgit
@ -302,12 +302,12 @@
- name: Copy in RepoAliases.header
copy: src=RepoAliases.header dest=/etc/gitolite/RepoAliases.header
owner=root group=root mode=0755
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
- name: Create the update-block-push-origin symlink
command: ln -s /usr/share/git-core/update-block-push-origin /etc/gitolite/local/VREF/update-block-push-origin
creates=/etc/gitolite/local/VREF/update-block-push-origin
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
tags:
- config
- distgit
@ -315,7 +315,7 @@
- name: install the fedmsg configuration
template: src=fedmsg-genacls-config.py dest=/etc/fedmsg.d/genacls.py
owner=root group=root mode=0644
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
tags:
- distgit
@ -324,7 +324,7 @@
with_items:
- /usr/local/bin/genacls.sh
- /etc/cron.d/genacls.cron
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
tags:
- config
- distgit
@ -343,7 +343,7 @@
- name: Save the list the users having a shell access
template: src=gitolite_admins dest=/etc/gitolite/admins
owner=gen-acls group=packager mode=660
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
tags:
- config
- distgit
@ -353,11 +353,11 @@
with_items:
- {name: /etc/gitolite/hooks, mode: 770, state: directory}
- {name: /etc/gitolite/hooks/common, mode: 770, state: directory}
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
- name: Fix permissions on the Gitolite stuff (touch update if it does not exist)
copy: content="" dest=/etc/gitolite/hooks/common/update force=no owner=root group=packager mode=0755
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
tags:
- distgit
- config
@ -482,7 +482,7 @@
- name: setup grokmirror for repos
package: name=python-grokmirror state=installed
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
tags:
- grokmirror
- pkgs
@ -505,7 +505,7 @@
- name: run initial grokmirror run
command: /usr/bin/grok-manifest -m /srv/git/grokmirror/manifest.js.gz -t /srv/git/repositories/ creates=/srv/git/grokmirror/manifest.js.gz
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
tags:
- grokmirror
- pkgs

4
roles/git/hooks/tasks/main.yml
View file

@ -10,7 +10,7 @@
- python-kitchen
- python-pygit2
- fedora-messaging
when: env != "staging"
when: env != "staging" and datacenter != "iad2"
tags:
- git
- git/hooks
@ -25,7 +25,7 @@
- python3-kitchen
- python3-pygit2
- fedora-messaging
when: env == "staging"
when: env == "staging" or datacenter == "iad2"
tags:
- git
- git/hooks