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:
Chaoyi Zha 2015-06-10 00:22:01 +00:00
commit 4dde89993d
15 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/beaker-stg
View file

@ -5,7 +5,7 @@ num_cpus: 2
tcp_ports: [ 80, 443, 8000 ]
udp_ports: [ 69 ]
fas_client_groups: sysadmin-qa
fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice
nrpe_procs_warn: 250
nrpe_procs_crit: 300

2
inventory/group_vars/bodhi-backend
View file

@ -35,4 +35,4 @@ fedmsg_certs:
owner: root
group: masher
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid"

2
inventory/group_vars/composers
View file

@ -35,4 +35,4 @@ fedmsg_certs:
owner: root
group: masher
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid"

2
inventory/group_vars/qadevel-stg
View file

@ -7,7 +7,7 @@ num_cpus: 1
# for systems that do not match the above - specify the same parameter in
# the host_vars/$hostname file
fas_client_groups: sysadmin-qa
fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice
# default virt install command is for a single nic-device
# define in another group file for more nics (see buildvm)

2
inventory/group_vars/releng
View file

@ -35,4 +35,4 @@ fedmsg_certs:
owner: root
group: masher
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid"

2
inventory/group_vars/resultsdb-dev
View file

@ -7,7 +7,7 @@ num_cpus: 4
# the host_vars/$hostname file
tcp_ports: [ 80, 443, "{{ resultsdb_db_port }}", "{{ execdb_db_port }}" ]
fas_client_groups: sysadmin-qa,sysadmin-main
fas_client_groups: sysadmin-qa,sysadmin-main.fi-apprentice
nrpe_procs_warn: 250
nrpe_procs_crit: 300

2
inventory/group_vars/taskotron-dev
View file

@ -1,4 +1,6 @@
---
fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice
grokmirror_basedir: /var/lib/git/mirror
grokmirror_user: grokmirror
grokmirror_repos:

2
inventory/host_vars/arm01-releng00.arm.fedoraproject.org
View file

@ -4,4 +4,4 @@
#
libdir: /usr/lib
nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3
nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid

2
inventory/host_vars/arm01-releng02.arm.fedoraproject.org
View file

@ -4,4 +4,4 @@
#
libdir: /usr/lib
nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3
nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid

2
inventory/host_vars/compose-x86-01.phx2.fedoraproject.org
View file

@ -36,4 +36,4 @@ kojipkgs_url: kojipkgs.fedoraproject.org
kojihub_url: koji.fedoraproject.org/kojihub
kojihub_scheme: https
nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3
nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid

2
inventory/host_vars/taskotron-dev01.qa.fedoraproject.org
View file

@ -8,7 +8,7 @@ volgroup: /dev/vg_guests
eth0_ip: 10.5.124.181
vmhost: virthost-comm04.qa.fedoraproject.org
datacenter: phx2
fas_client_groups: sysadmin-qa,sysadmin-main
fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice
lvm_size: 45000
# default virt install command is for a single nic-device

2
playbooks/groups/backup-server.yml
View file

@ -23,7 +23,7 @@
- sudo
- collectd/base
- { role: nfs/client,
mnt_dir: 'fedora_backups',
mnt_dir: '/fedora_backups',
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid",
nfs_src_dir: 'fedora_backups' }
- openvpn/client

2
playbooks/groups/pkgs.yml
View file

@ -42,7 +42,7 @@
- git/server
- git/hooks
- clamav
- { role: nfs/client, when: env != "staging", mnt_dir: '/srv/cache/lookaside', nfs_src_dir: 'fedora_sourcecache', nfs_mount_opts='rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3' }
- { role: nfs/client, when: env != "staging", mnt_dir: '/srv/cache/lookaside', nfs_src_dir: 'fedora_sourcecache', nfs_mount_opts='rw,hard,bg,intr,noatime,nodev,nosuid' }
- distgit
tasks:

4
playbooks/groups/secondary.yml
View file

@ -40,11 +40,11 @@
nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/archive' }
- { role: nfs/client,
mnt_dir: '/srv/pub/alt',
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3",
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid",
nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/alt' }
- { role: nfs/client,
mnt_dir: '/srv/pub/fedora-secondary',
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3",
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid",
nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/fedora-secondary' }
- role: apache

4
roles/nfs/client/tasks/main.yml
View file

@ -67,7 +67,7 @@
- name: nfs mount points (phx2)
mount: >
name={{ mnt_dir }}
src=vtap-fedora-nfs01.storage.phx2.redhat.com:/vol/{{ nfs_src_dir }}
src=ntap-phx2-c01-fedora01-nfs.storage.phx2.redhat.com:/{{ nfs_src_dir }}
fstype=nfs
opts={{nfs_mount_opts}}
passno=0
@ -80,7 +80,7 @@
- name: nfs mount points (rdu)
mount: >
name={{ mnt_dir }}
src=172.31.1.10:/vol/{{ nfs_src_dir }}
src=172.31.1.11:/{{ nfs_src_dir }}
fstype=nfs
opts={{nfs_mount_opts}}
passno=0