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

This commit is contained in:
Stephen Smoogen 2020-05-21 15:22:55 -04:00
commit 581d301f8c
2 changed files with 15 additions and 2 deletions

View file

@ -69,8 +69,8 @@
critical: 100
when: datacenter != 'iad2'
- batcave
- { role: nfs/client, when: inventory_hostname.startswith('batcave') and datacenter != 'iad2', mnt_dir: '/srv/web/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' }
- { role: nfs/client, when: inventory_hostname.startswith('batcave01') and datacenter != 'iad2', mnt_dir: '/mnt/fedora/app', nfs_src_dir: 'fedora_app/app' }
- { role: nfs/client, when: inventory_hostname.startswith('batcave'), mnt_dir: '/srv/web/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' }
- { role: nfs/client, when: inventory_hostname.startswith('batcave01'), mnt_dir: '/mnt/fedora/app', nfs_src_dir: 'fedora_app/app' }
- { role: mirror_pagure_ansible, tags: ['mirror_pagure_ansible'] }
pre_tasks:

View file

@ -96,6 +96,19 @@
tags:
- nfs/client
- name: nfs mount points (iad2)
mount: >
name={{ mnt_dir }}
src=ntap-iad2-c02-fedora01-nfs01a:/{{ nfs_src_dir }}
fstype=nfs
opts={{nfs_mount_opts}}
passno=0
dump=0
state=mounted
when: datacenter == 'iad2' and (env != 'staging' or mount_stg is defined)
tags:
- nfs/client
- name: nfs mount points (rdu)
mount: >
name={{ mnt_dir }}