infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

Rename releng01/02 to branched-composer and rawhide-composer.

Browse source
This commit is contained in:
Kevin Fenzi 2014-07-08 18:28:06 +00:00
parent 9e8ae648ab
commit 8482fd40ac
16 changed files with 64 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

8
files/releng/fedmsg/endpoints.py
View file

@ -24,11 +24,11 @@ config = dict(
"tcp://app02.%s:300%i" % (suffix, i)
for i in range(8)
],
"bodhi.releng01": [
"tcp://releng01.%s:3000" % suffix
"bodhi.branched-composer": [
"tcp://branched-composer.%s:3000" % suffix
],
"bodhi.releng02": [
"tcp://releng02.%s:3000" % suffix
"bodhi.rawhide-composer": [
"tcp://rawhide-composer.%s:3000" % suffix
],
"bodhi.app03": [
"tcp://app03.%s:300%i" % (suffix, i)

8
files/releng/fedmsg/ssl.py
View file

@ -50,12 +50,12 @@ config = dict(
] + [
("shell.relepel01", "shell-relepel01.%s" % suffix),
("shell.releng04", "shell-releng04.%s" % suffix),
("shell.releng01", "shell-releng01.%s" % suffix),
("shell.releng02", "shell-releng02.%s" % suffix),
("shell.branched-composer", "shell-releng01.%s" % suffix),
("shell.rawhide-composer", "shell-releng02.%s" % suffix),
("bodhi.relepel01", "bodhi-relepel01.%s" % suffix),
("bodhi.releng04", "bodhi-releng04.%s" % suffix),
("bodhi.releng01", "bodhi-releng01.%s" % suffix),
("bodhi.releng02", "bodhi-releng02.%s" % suffix),
("bodhi.branched-composer", "bodhi-releng01.%s" % suffix),
("bodhi.rawhide-composer", "bodhi-releng02.%s" % suffix),
] + [
("shell.value01", "shell-value01.%s" % suffix),
("shell.value03", "shell-value03.%s" % suffix),

23
inventory/host_vars/branched-composer.phx2.fedoraproject.org Normal file
View file

@ -0,0 +1,23 @@
---
vmhost: bvirthost08.phx2.fedoraproject.org
eth0_ip: 10.5.125.66
eth1_ip: 10.5.127.53
volgroup: /dev/xenGuests
mem_size: 16384
num_cpus: 16
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/
virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
--disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
--vcpus={{ num_cpus }} -l {{ ks_repo }} -x
"ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0
hostname={{ inventory_hostname }} nameserver={{ dns }}
ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none
ip={{ eth1_ip }}:::{{ nm }}:{{ inventory_hostname }}-nfs:eth1:none"
--network=bridge=br0,model=virtio --network=bridge=br1,model=virtio
--autostart --noautoconsole
# With 16 cpus, theres a bunch more kernel threads
nrpe_procs_warn: 900
nrpe_procs_crit: 1000

0
inventory/host_vars/releng02.phx2.fedoraproject.org → inventory/host_vars/rawhide-composer.phx2.fedoraproject.org
View file

4
inventory/host_vars/releng01.phx2.fedoraproject.org
View file

@ -1,4 +0,0 @@
---
vmhost: buildvmhost-06.phx2.fedoraproject.org
eth0_ip: 10.5.125.66

4
inventory/inventory
View file

@ -193,8 +193,8 @@ collab03.fedoraproject.org
collab04.fedoraproject.org
[releng]
#releng01.phx2.fedoraproject.org
releng02.phx2.fedoraproject.org
branched-composer.phx2.fedoraproject.org
rawhide-composer.phx2.fedoraproject.org
releng04.phx2.fedoraproject.org
relepel01.phx2.fedoraproject.org

4
playbooks/groups/releng.yml
View file

@ -4,7 +4,7 @@
# NOTE: most of these vars_path come from group_vars/releng or from hostvars
- name: make releng systems
hosts: releng02.phx2.fedoraproject.org
hosts: branched-composer.phx2.fedoraproject.org:rawhide-composer.phx2.fedoraproject.org
user: root
gather_facts: False
accelerate: "{{ accelerated }}"
@ -23,7 +23,7 @@
# Once the instance exists, configure it.
- name: make releng server system
hosts: releng02.phx2.fedoraproject.org
hosts: branched-composer.phx2.fedoraproject.org:rawhide-composer.phx2.fedoraproject.org
user: root
gather_facts: True
accelerate: "{{ accelerated }}"

12
roles/fedmsg/base/templates/endpoints.py.j2
View file

@ -17,13 +17,13 @@ config = dict(
# name of it's calling module to determine which endpoint definition
# to use. This can be overridden by explicitly providing the name in
# the initial call to fedmsg.init(...).
"bodhi.releng01": [
"tcp://releng01.%s:3000" % suffix,
"tcp://releng01.%s:3001" % suffix,
"bodhi.branched-composer": [
"tcp://branched-composer.%s:3000" % suffix,
"tcp://branched-composer.%s:3001" % suffix,
],
"bodhi.releng02": [
"tcp://releng02.%s:3000" % suffix,
"tcp://releng02.%s:3001" % suffix,
"bodhi.rawhide-composer": [
"tcp://rawhide-composer.%s:3000" % suffix,
"tcp://rawhide-composer.%s:3001" % suffix,
],
"bodhi.bodhi01": [
"tcp://bodhi01.%s:300%i" % (suffix, i)

8
roles/fedmsg/base/templates/ssl.py.j2
View file

@ -83,13 +83,13 @@ config = dict(
for i in range(1, 2)
] + [
("shell.relepel01", "shell-relepel01.%s" % suffix),
("shell.releng01", "shell-releng01.%s" % suffix),
("shell.releng02", "shell-releng02.%s" % suffix),
("shell.branched-composer", "shell-branched-composer.%s" % suffix),
("shell.rawhide-composer", "shell-rawhide-composer.%s" % suffix),
("shell.releng03", "shell-releng03.%s" % suffix),
("shell.releng04", "shell-releng04.%s" % suffix),
("bodhi.relepel01", "bodhi-relepel01.%s" % suffix),
("bodhi.releng01", "bodhi-releng01.%s" % suffix),
("bodhi.releng02", "bodhi-releng02.%s" % suffix),
("bodhi.branched-composer", "bodhi-branched-composer.%s" % suffix),
("bodhi.rawhide-composer", "bodhi-rawhide-composer.%s" % suffix),
("bodhi.releng03", "bodhi-releng03.%s" % suffix),
("bodhi.releng04", "bodhi-releng04.%s" % suffix),
] + [

8
roles/nagios_server/files/nagios/hosts/branched-composer.cfg Normal file
View file

@ -0,0 +1,8 @@
define host {
host_name branched-composer
alias branched-composer.phx2.fedoraproject.org
use defaulttemplate
address branched-composer.phx2.fedoraproject.org
parents bvirthost08
contact_groups build-sysadmin-email
}

7
roles/nagios_server/files/nagios/hosts/rawhide-composer.cfg Normal file
View file

@ -0,0 +1,7 @@
define host {
host_name rawhide-composer
alias rawhide-composer.phx2.fedoraproject.org
use defaulttemplate
address rawhide-composer.phx2.fedoraproject.org
parents bvirthost06
}

8
roles/nagios_server/files/nagios/hosts/releng01.cfg
View file

@ -1,8 +0,0 @@
#define host {
# host_name releng01
# alias releng01.phx2.fedoraproject.org
# use defaulttemplate
# address releng01.phx2.fedoraproject.org
# parents buildvmhost-06
# contact_groups build-sysadmin-email
#}

7
roles/nagios_server/files/nagios/hosts/releng02.cfg
View file

@ -1,7 +0,0 @@
define host {
host_name releng02
alias releng02.phx2.fedoraproject.org
use defaulttemplate
address releng02.phx2.fedoraproject.org
parents bvirthost05
}

2
roles/nagios_server/files/nagios/services/disk.cfg
View file

@ -14,7 +14,7 @@ define service {
#}
define service {
host_name noc01, proxy01, proxy02, releng02, db01
host_name noc01, proxy01, proxy02, rawhide-composer, branched-composer, db01
service_description Disk Space /boot
check_command check_by_nrpe!check_disk_/boot
use disktemplate

2
roles/nagios_server/files/nagios/services/locking.cfg
View file

@ -1,5 +1,5 @@
define service {
host_name releng02, koji03, releng04
host_name branched-composer, rawhide-composer, koji03
service_description Check NFS File Locks
check_command check_by_nrpe!check_lock
use criticaltemplate

4
tasks/koji/releng_config.yml
View file

@ -129,12 +129,12 @@
# put cron job in for branched compose
- name: branched compose cron
action: copy src="{{ files }}/releng/branched" dest=/etc/cron.d/branched
when: inventory_hostname.startswith('releng01')
when: inventory_hostname.startswith('branched-composer')
# put cron job in for rawhide compose
- name: rawhide compose cron
action: copy src="{{ files }}/releng/rawhide" dest=/etc/cron.d/rawhide
when: inventory_hostname.startswith('releng02')
when: inventory_hostname.startswith('rawhide-composer')
- name: sudoers defaults
action: copy src="{{ private }}/files/sudo/releng-sudoers" dest=/etc/sudoers mode=0440