Infrastructure/ansible
1
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 2016-09-06 20:15:09 +00:00
commit 32f607a33f
23 changed files with 190 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

10
inventory/builders
View file

@ -46,6 +46,11 @@ buildvm-aarch64-07.arm.fedoraproject.org
buildvm-aarch64-08.arm.fedoraproject.org
buildvm-aarch64-09.arm.fedoraproject.org
buildvm-aarch64-10.arm.fedoraproject.org
buildvm-aarch64-11.arm.fedoraproject.org
buildvm-aarch64-12.arm.fedoraproject.org
buildvm-aarch64-17.arm.fedoraproject.org
buildvm-aarch64-18.arm.fedoraproject.org
buildvm-aarch64-19.arm.fedoraproject.org
[buildvm-ppc64]
buildvm-ppc64-01.ppc.fedoraproject.org
@ -87,6 +92,11 @@ aarch64-c07n1.arm.fedoraproject.org
aarch64-c08n1.arm.fedoraproject.org
aarch64-c09n1.arm.fedoraproject.org
aarch64-c10n1.arm.fedoraproject.org
aarch64-c11n1.arm.fedoraproject.org
aarch64-c12n1.arm.fedoraproject.org
aarch64-c17n1.arm.fedoraproject.org
aarch64-c18n1.arm.fedoraproject.org
aarch64-c19n1.arm.fedoraproject.org
[buildhw]
buildhw-01.phx2.fedoraproject.org

2
inventory/group_vars/bodhi-backend-stg
View file

@ -72,7 +72,7 @@ fedmsg_certs:
- bodhi.updates.epel.sync
- bodhi.updates.fedora.sync
fas_client_groups: sysadmin-releng
fas_client_groups: sysadmin-releng,sysadmin-bodhi
sudoers: "{{ private }}/files/sudo/00releng-sudoers"

2
inventory/group_vars/bodhi2-stg
View file

@ -23,7 +23,7 @@ tcp_ports: [ 80 ]
# Neeed for rsync from log01 for logs.
custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]
fas_client_groups: sysadmin-noc
fas_client_groups: sysadmin-noc,sysadmin-bodhi
# Mount /mnt/fedora_koji as read-only in staging
nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid"

2
inventory/group_vars/fedimg-stg
View file

@ -15,6 +15,8 @@ tcp_ports: [
# TODO, restrict this down to just sysadmin-releng
fas_client_groups: sysadmin-datanommer,sysadmin-releng,sysadmin-fedimg,fi-apprentice,sysadmin-noc,sysadmin-veteran
fedmsg_debug_loopback: True
# These people get told when something goes wrong.
fedmsg_error_recipients:
- sysadmin-fedimg-members@fedoraproject.org

5
inventory/hardware
View file

@ -83,3 +83,8 @@ aarch64-c07n1.arm.fedoraproject.org
aarch64-c08n1.arm.fedoraproject.org
aarch64-c09n1.arm.fedoraproject.org
aarch64-c10n1.arm.fedoraproject.org
aarch64-c11n1.arm.fedoraproject.org
aarch64-c12n1.arm.fedoraproject.org
aarch64-c17n1.arm.fedoraproject.org
aarch64-c18n1.arm.fedoraproject.org
aarch64-c19n1.arm.fedoraproject.org

4
inventory/host_vars/buildvm-aarch64-11.arm.fedoraproject.org Normal file
View file

@ -0,0 +1,4 @@
---
vmhost: aarch64-c11n1.arm.fedoraproject.org
eth0_ip: 10.5.129.161
eth1_ip: 10.5.127.86

4
inventory/host_vars/buildvm-aarch64-12.arm.fedoraproject.org Normal file
View file

@ -0,0 +1,4 @@
---
vmhost: aarch64-c12n1.arm.fedoraproject.org
eth0_ip: 10.5.129.162
eth1_ip: 10.5.127.87

4
inventory/host_vars/buildvm-aarch64-13.arm.fedoraproject.org Normal file
View file

@ -0,0 +1,4 @@
---
vmhost: aarch64-c13n1.arm.fedoraproject.org
eth0_ip: 10.5.129.163
eth1_ip: 10.5.127.88

4
inventory/host_vars/buildvm-aarch64-14.arm.fedoraproject.org Normal file
View file

@ -0,0 +1,4 @@
---
vmhost: aarch64-c14n1.arm.fedoraproject.org
eth0_ip: 10.5.129.164
eth1_ip: 10.5.127.89

4
inventory/host_vars/buildvm-aarch64-15.arm.fedoraproject.org Normal file
View file

@ -0,0 +1,4 @@
---
vmhost: aarch64-c15n1.arm.fedoraproject.org
eth0_ip: 10.5.129.165
eth1_ip: 10.5.127.90

4
inventory/host_vars/buildvm-aarch64-16.arm.fedoraproject.org Normal file
View file

@ -0,0 +1,4 @@
---
vmhost: aarch64-c16n1.arm.fedoraproject.org
eth0_ip: 10.5.129.166
eth1_ip: 10.5.127.91

4
inventory/host_vars/buildvm-aarch64-17.arm.fedoraproject.org Normal file
View file

@ -0,0 +1,4 @@
---
vmhost: aarch64-c17n1.arm.fedoraproject.org
eth0_ip: 10.5.129.167
eth1_ip: 10.5.127.92

4
inventory/host_vars/buildvm-aarch64-18.arm.fedoraproject.org Normal file
View file

@ -0,0 +1,4 @@
---
vmhost: aarch64-c18n1.arm.fedoraproject.org
eth0_ip: 10.5.129.168
eth1_ip: 10.5.127.93

4
inventory/host_vars/buildvm-aarch64-19.arm.fedoraproject.org Normal file
View file

@ -0,0 +1,4 @@
---
vmhost: aarch64-c19n1.arm.fedoraproject.org
eth0_ip: 10.5.129.169
eth1_ip: 10.5.127.94

4
inventory/host_vars/buildvm-aarch64-20.arm.fedoraproject.org Normal file
View file

@ -0,0 +1,4 @@
---
vmhost: aarch64-c20n1.arm.fedoraproject.org
eth0_ip: 10.5.129.170
eth1_ip: 10.5.127.95

2
playbooks/manual/upgrade/bodhi.yml
View file

@ -89,7 +89,7 @@
command: /usr/bin/alembic -c /usr/share/bodhi/alembic.ini upgrade head
args:
chdir: /usr/share/bodhi/
when: inventory_hostname.startswith('bodhi-backend01')
when: inventory_hostname.startswith('bodhi-backend03')
- name: And... start the backend again
service: name="fedmsg-hub" state=started

22
roles/bodhi2/backend/tasks/main.yml
View file

@ -162,7 +162,7 @@
cron: name="owner-sync-el5" minute="7,17,27,37,47,57" user="root"
job="/usr/local/bin/owner-sync-pkgdb dist-5E-epel"
cron_file=update-koji-owner-EL-5
when: inventory_hostname.startswith('bodhi-backend01') and env == "production"
when: inventory_hostname.startswith('bodhi-backend03') and env == "production"
tags:
- bodhi
@ -170,7 +170,7 @@
cron: name="owner-sync-el6" minute="7,17,27,37,47,57" user="root"
job="/usr/local/bin/owner-sync-pkgdb dist-6E-epel"
cron_file=update-koji-owner-EL-6
when: inventory_hostname.startswith('bodhi-backend01') and env == "production"
when: inventory_hostname.startswith('bodhi-backend03') and env == "production"
tags:
- bodhi
@ -178,7 +178,7 @@
cron: name="owner-sync-epel7" minute="7,17,27,37,47,57" user="root"
job="/usr/local/bin/owner-sync-pkgdb epel7"
cron_file=update-koji-owner-epel7
when: inventory_hostname.startswith('bodhi-backend01') and env == "production"
when: inventory_hostname.startswith('bodhi-backend03') and env == "production"
tags:
- bodhi
@ -186,7 +186,7 @@
cron: name="owner-sync-fedora" minute="7,17,27,37,47,57" user="root"
job="/usr/local/bin/owner-sync-pkgdb f23;/usr/local/bin/owner-sync-pkgdb f24;/usr/local/bin/owner-sync-pkgdb f25;/usr/local/bin/owner-sync-pkgdb f26"
cron_file=update-koji-owner-fedora
when: inventory_hostname.startswith('bodhi-backend01') and env == "production"
when: inventory_hostname.startswith('bodhi-backend03') and env == "production"
tags:
- bodhi
#
@ -195,7 +195,7 @@
- name: put fedora-updates-push in place
copy: src=fedora-updates-push dest=/usr/local/bin/fedora-updates-push mode=0755
when: inventory_hostname.startswith('bodhi-backend01') and env == "production"
when: inventory_hostname.startswith('bodhi-backend03') and env == "production"
tags:
- config
- bodhi
@ -203,7 +203,7 @@
- name: put fedora-epel-push in place
copy: src=fedora-epel-push dest=/usr/local/bin/fedora-epel-push mode=0755
when: inventory_hostname.startswith('bodhi-backend01') and env == "production"
when: inventory_hostname.startswith('bodhi-backend03') and env == "production"
tags:
- config
- bodhi
@ -211,7 +211,7 @@
- name: put update-fullfiletimelist in place
copy: src="{{ files }}/scripts/update-fullfiletimelist" dest=/usr/local/bin/update-fullfiletimelist mode=0755
when: inventory_hostname.startswith('bodhi-backend01') and env == "production"
when: inventory_hostname.startswith('bodhi-backend03') and env == "production"
tags:
- config
- bodhi
@ -219,7 +219,7 @@
- name: add create-filelist script from quick-fedora-mirror
copy: src="{{ files }}/scripts/create-filelist" dest=/usr/local/bin/create-filelist mode=0755
when: inventory_hostname.startswith('bodhi-backend01') and env == "production"
when: inventory_hostname.startswith('bodhi-backend03') and env == "production"
tags:
- config
- bodhi
@ -229,7 +229,7 @@
cron: name="updates-sync" minute="15,45" user="ftpsync"
job="/usr/local/bin/lock-wrapper fedora-updates-push '/usr/local/bin/fedora-updates-push && /usr/local/bin/update-fullfiletimelist -l /tmp/update-fullfiletimelist-fedora.lock -t /pub fedora'"
cron_file=updates-sync
when: inventory_hostname.startswith('bodhi-backend01') and env == "production"
when: inventory_hostname.startswith('bodhi-backend03') and env == "production"
tags:
- config
- bodhi
@ -239,7 +239,7 @@
cron: name="epel-updates-sync" minute="15,45" user="ftpsync"
job="/usr/local/bin/lock-wrapper fedora-epel-push '/usr/local/bin/fedora-epel-push && /usr/local/bin/update-fullfiletimelist -l /tmp/update-fullfiletimelist-epel.lock -t /pub epel'"
cron_file=updates-sync
when: inventory_hostname.startswith('bodhi-backend01') and env == "production"
when: inventory_hostname.startswith('bodhi-backend03') and env == "production"
tags:
- config
- bodhi
@ -249,7 +249,7 @@
cron: name="directory-sizes-update" minute="30" hour="19" user="ftpsync"
job="/usr/bin/find /pub/alt/ /pub/archive/ /pub/fedora-secondary/ /pub/fedora/ /pub/epel/ -type d ! -path '/pub/alt/screenshots/f21/source' | grep -v snapshot | /usr/bin/xargs -n 1 /usr/bin/du --exclude=.snapshot -sh > /tmp/DIRECTORY_SIZES.txt 2> /dev/null; cp /tmp/DIRECTORY_SIZES.txt /pub/"
cron_file=directory-sizes-update
when: inventory_hostname.startswith('bodhi-backend01') and env == "production"
when: inventory_hostname.startswith('bodhi-backend03') and env == "production"
tags:
- config
- bodhi

2
roles/bodhi2/base/templates/updates_handler.py
View file

@ -1,5 +1,5 @@
config = dict(
# Note, the masher runs on bodhi-backend01, but this
# Note, the masher runs on bodhi-backend03, but this
# runs on bodhi-backend02 (separation of concerns).
updates_handler={{bodhi_updates_handler_enabled}},
)

119
roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
View file

@ -1570,21 +1570,6 @@ shared-network qa {
option host-name "ppc-comm01-mgmt";
}
host ppc-comm01 {
hardware ethernet 6c:ae:8b:00:0f:f0;
fixed-address 10.5.124.219;
option host-name "ppc-comm01";
filename "yaboot";
}
host ppc-comm04.qa.fedoraproject.org {
hardware ethernet 5c:f3:fc:89:bd:c0;
fixed-address 10.5.124.221;
next-server ppc-builder7.qa.fedoraproject.org;
option host-name "ppc-comm04";
filename "ppccomm04";
}
host qa01 {
hardware ethernet 00:21:5E:C7:5C:84;
fixed-address 10.5.124.151;
@ -1884,13 +1869,6 @@ shared-network qa {
filename "pxelinux.0";
}
host ppc-comm08 {
hardware ethernet 6c:ae:8b:02:66:27;
fixed-address 10.5.124.143;
option host-name "ppc-comm08";
filename "pxelinux.0";
}
}
@ -1990,21 +1968,6 @@ shared-network qa {
filename "pxelinux.0";
}
host ppc-le-builder7 {
hardware ethernet 52:54:00:4e:c0:de;
fixed-address 10.5.131.57;
next-server 10.5.131.56;
option host-name "ppc-le-builder7.qa.fedoraproject.org";
filename "/boot/grub2/powerpc-ieee1275/core.elf";
}
host ppc-builder9 {
hardware ethernet 5C:F3:FC:89:BD:C5;
fixed-address 10.5.124.142;
next-server 10.5.124.136;
option host-name "ppc-builder9.qa.fedoraproject.org";
filename "/boot/grub2/powerpc-ieee1275/core.elf";
}
}
}
@ -2014,7 +1977,7 @@ subnet 10.5.129.0 netmask 255.255.255.0 {
allow booting;
allow bootp;
option domain-name "secarch.fedoraproject.org phx2.fedoraproject.org qa.fedoraproject.org fedoraproject.org";
option domain-name "secarch.fedoraproject.org ppc.fedoraproject.org arm.fedoraproject.org phx2.fedoraproject.org fedoraproject.org";
option domain-name-servers 10.5.126.21, 10.5.126.22;
option routers 10.5.129.254;
option log-servers 10.5.126.29;
@ -2127,5 +2090,85 @@ subnet 10.5.129.0 netmask 255.255.255.0 {
filename "grubaa64.efi";
}
host aarch64-c11n1 {
hardware ethernet 14:58:D0:58:B5:A2;
fixed-address 10.5.129.111;
next-server 10.5.126.41;
option host-name "aarch64-c11n1";
filename "grubaa64.efi";
}
host aarch64-c12n1 {
hardware ethernet 14:58:D0:58:B2:F2;
fixed-address 10.5.129.112;
next-server 10.5.126.41;
option host-name "aarch64-c12n1";
filename "grubaa64.efi";
}
host aarch64-c13n1 {
hardware ethernet 14:58:D0:58:95:22;
fixed-address 10.5.129.113;
next-server 10.5.126.41;
option host-name "aarch64-c13n1";
filename "grubaa64.efi";
}
host aarch64-c14n1 {
hardware ethernet 14:58:D0:58:75:32;
fixed-address 10.5.129.114;
next-server 10.5.126.41;
option host-name "aarch64-c14n1";
filename "grubaa64.efi";
}
host aarch64-c15n1 {
hardware ethernet 14:58:D0:58:C5:52;
fixed-address 10.5.129.115;
next-server 10.5.126.41;
option host-name "aarch64-c15n1";
filename "grubaa64.efi";
}
host aarch64-c16n1 {
hardware ethernet 14:58:D0:58:35:12;
fixed-address 10.5.129.116;
next-server 10.5.126.41;
option host-name "aarch64-c16n1";
filename "grubaa64.efi";
}
host aarch64-c17n1 {
hardware ethernet 14:58:D0:58:C4:F2;
fixed-address 10.5.129.117;
next-server 10.5.126.41;
option host-name "aarch64-c17n1";
filename "grubaa64.efi";
}
host aarch64-c18n1 {
hardware ethernet 14:58:D0:58:74:32;
fixed-address 10.5.129.118;
next-server 10.5.126.41;
option host-name "aarch64-c18n1";
filename "grubaa64.efi";
}
host aarch64-c19n1 {
hardware ethernet 14:58:D0:58:D4:12;
fixed-address 10.5.129.119;
next-server 10.5.126.41;
option host-name "aarch64-c19n1";
filename "grubaa64.efi";
}
host aarch64-c20n1 {
hardware ethernet 14:58:D0:58:E4:B2;
fixed-address 10.5.129.120;
next-server 10.5.126.41;
option host-name "aarch64-c20n1";
filename "grubaa64.efi";
}
}

10
roles/dns/files/zones.conf
View file

@ -372,3 +372,13 @@ zone "pagure.org" {
file "/var/named/master/built/pagure.org";
};
zone "mirrormanager.net" {
type master;
file "/var/named/master/built/mirrormanager.net";
};
zone "mirrormanager.org" {
type master;
file "/var/named/master/built/mirrormanager.org";
};

1
roles/fedimg/tasks/main.yml
View file

@ -78,6 +78,7 @@
owner=fedmsg group=fedmsg mode=0644
notify:
- restart fedmsg-hub
when: env != "staging"
tags:
- fedimg
- hotfix

14
roles/nagios/server/files/nagios/hosts/bodhi-backend01.cfg
View file

@ -1,7 +1,7 @@
define host {
host_name bodhi-backend01
alias bodhi-backend01.phx2.fedoraproject.org
use defaulttemplate
address bodhi-backend01.phx2.fedoraproject.org
parents bvirthost10
}
#define host {
# host_name bodhi-backend01
# alias bodhi-backend01.phx2.fedoraproject.org
# use defaulttemplate
# address bodhi-backend01.phx2.fedoraproject.org
# parents bvirthost10
#}

22
roles/openqa/server/tasks/main.yml
View file

@ -93,6 +93,21 @@
tags:
- packages
- name: Check test directory exists with correct ownership
file: path=/var/lib/openqa/share/tests/fedora state=directory owner=geekotest group=geekotest recurse=yes
# we don't want to run the checkout if the tests are on a non-standard
# branch, as that usually means we're messing around on staging and
# don't want the checkout reset to HEAD.
- name: Check if tests are checked out and on a non-standard branch
command: "git status"
args:
chdir: /var/lib/openqa/share/tests/fedora
register: testsbranch
failed_when: "1 != 1"
changed_when: "1 != 1"
always_run: true
- name: Check out the tests
git:
repo: https://bitbucket.org/rajcze/openqa_fedora
@ -100,6 +115,7 @@
register: gittests
become: true
become_user: geekotest
when: "(testsbranch.stdout.find('Not a git repository') != -1) or (testsbranch.stdout.find('On branch develop') != -1)"
- name: Check out openqa_fedora_tools
git:
@ -223,7 +239,7 @@
- name: Dump existing config for checking changes
shell: "/usr/share/openqa/script/dump_templates --json > /tmp/tmpl-old.json"
when: "gittests|changed"
when: "(gittests is defined) and (gittests|changed)"
changed_when: "1 != 1"
# Because of the boring details of how template loading works, getting
@ -232,12 +248,12 @@
# the *following* step will register as changed.
- name: Load tests
shell: "/var/lib/openqa/share/tests/fedora/templates --clean"
when: "gittests|changed"
when: "(gittests is defined) and (gittests|changed)"
changed_when: "1 != 1"
- name: Check if the tests changed in previous step
shell: "/usr/share/openqa/script/dump_templates --json > /tmp/tmpl-new.json && json_diff /tmp/tmpl-old.json /tmp/tmpl-new.json"
when: "gittests|changed"
when: "(gittests is defined) and (gittests|changed)"
register: testsdiff
changed_when: "testsdiff.rc > 0"
failed_when: "1 != 1"