From cd327147a85dacffadb7ad2e9c5b0b32401b5e27 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 8 May 2020 15:49:27 -0700 Subject: [PATCH] iad2: add a batcave01 in iad2 Signed-off-by: Kevin Fenzi --- .../batcave01.iad2.fedoraproject.org | 30 +++++++++++++++++++ inventory/inventory | 2 ++ playbooks/groups/batcave.yml | 4 +-- 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 inventory/host_vars/batcave01.iad2.fedoraproject.org diff --git a/inventory/host_vars/batcave01.iad2.fedoraproject.org b/inventory/host_vars/batcave01.iad2.fedoraproject.org new file mode 100644 index 0000000000..b0f5498093 --- /dev/null +++ b/inventory/host_vars/batcave01.iad2.fedoraproject.org @@ -0,0 +1,30 @@ +--- +nm: 255.255.255.0 +gw: 10.3.163.254 +dns: 10.3.163.33 + +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/ + +volgroup: /dev/vg_guests +eth0_ip: 10.3.163.35 +#eth1_ip: +vmhost: vmhost01.iad2.fedoraproject.org +datacenter: iad2 + +#host_backup_targets: ['/git', '/mnt/fedora/app/attachments'] + +# +# We need this to install with 2 nics +# +virt_install_command: "{{ virt_install_command_two_nic }}" + +# GDPR SAR variables - koji +sar_script: /usr/local/bin/koji_sar.py +sar_script_user: root +sar_output_file: koji.json + +# Add VPN host name as alt name for SSH cert. Useful when you need to +# SSH into batcave through VPN, like from bastion in a different DC. +ssh_hostnames: +- batcave01.vpn.fedoraproject.org diff --git a/inventory/inventory b/inventory/inventory index 50e0fa32e3..d6bc8060ef 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -319,6 +319,7 @@ kojipkgs02.phx2.fedoraproject.org [infracore] batcave01.phx2.fedoraproject.org +batcave01.iad2.fedoraproject.org log01.phx2.fedoraproject.org log01.iad2.fedoraproject.org noc01.phx2.fedoraproject.org @@ -333,6 +334,7 @@ log01.iad2.fedoraproject.org [batcave] batcave01.phx2.fedoraproject.org +batcave01.iad2.fedoraproject.org batcave13.rdu2.fedoraproject.org [ipa] diff --git a/playbooks/groups/batcave.yml b/playbooks/groups/batcave.yml index 054e1734b7..3867d8a7d1 100644 --- a/playbooks/groups/batcave.yml +++ b/playbooks/groups/batcave.yml @@ -49,8 +49,8 @@ warning: 10 critical: 100 - batcave - - { 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: 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: mirror_pagure_ansible, tags: ['mirror_pagure_ansible'] } pre_tasks: