From 248b7988138182c056362707b4e9b523dcb7a4b6 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 21 May 2020 12:14:25 -0700 Subject: [PATCH] nfs/client and batcave: adjust nfs/client playbook to work hopefully in iad2 Signed-off-by: Kevin Fenzi --- playbooks/groups/batcave.yml | 4 ++-- roles/nfs/client/tasks/main.yml | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/playbooks/groups/batcave.yml b/playbooks/groups/batcave.yml index cbe528ae11..61c89c3942 100644 --- a/playbooks/groups/batcave.yml +++ b/playbooks/groups/batcave.yml @@ -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: diff --git a/roles/nfs/client/tasks/main.yml b/roles/nfs/client/tasks/main.yml index 03362602b6..bef6040751 100644 --- a/roles/nfs/client/tasks/main.yml +++ b/roles/nfs/client/tasks/main.yml @@ -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 }}