diff --git a/inventory/group_vars/all b/inventory/group_vars/all index a42c86a19c..2e31d8036e 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -393,8 +393,8 @@ baseiptables: True # Most of our machines have manual resolv.conf files # These settings are for machines where NM is supposed to control resolv.conf. nm_controlled_resolv: False -dns1: "10.5.126.21" -dns2: "10.5.126.22" +dns1: "10.3.163.33" +dns2: "10.3.163.34" # This is a list of services that need to wait for VPN to be up before getting started. postvpnservices: [] diff --git a/inventory/group_vars/buildvm_s390x b/inventory/group_vars/buildvm_s390x index 2956dbf343..0294644e26 100644 --- a/inventory/group_vars/buildvm_s390x +++ b/inventory/group_vars/buildvm_s390x @@ -8,15 +8,15 @@ vmhost: buildvmhost-s390x-01.s390.fedoraproject.org gw: 10.16.0.254 main_bridge: vmbr volgroup: /dev/fedora_linux_lpar_1 -ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-31-s390x -ks_repo: http://10.5.126.23/pub/fedora-secondary/releases/31/Server/s390x/os/ -dns: 10.5.126.21 +ks_url: http://10.3.163.35/repo/rhel/ks/buildvm-fedora-31-s390x +ks_repo: http://10.3.163.35/pub/fedora-secondary/releases/31/Server/s390x/os/ +dns: 10.3.163.33 nm: 255.255.255.0 virt_install_command: "{{ virt_install_command_s390x_one_nic }}" ansible_ifcfg_blacklist: True createrepo: False -host_group: kojibuilder +host_group: kojibuilder_iad2 fas_client_groups: sysadmin-releng sudoers: "{{ private }}/files/sudo/00releng-sudoers" diff --git a/inventory/group_vars/buildvm_s390x_stg b/inventory/group_vars/buildvm_s390x_stg index b3663c5adf..3a64fddf68 100644 --- a/inventory/group_vars/buildvm_s390x_stg +++ b/inventory/group_vars/buildvm_s390x_stg @@ -1,7 +1,7 @@ --- ansible_ifcfg_blacklist: True createrepo: False -host_group: kojibuilder +host_group: kojibuilder_iad2 fas_client_groups: sysadmin-releng sudoers: "{{ private }}/files/sudo/00releng-sudoers" ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-31-s390x diff --git a/roles/base/files/resolv.conf/kojibuilder b/roles/base/files/resolv.conf/kojibuilder index c2f1098249..379abdade9 100644 --- a/roles/base/files/resolv.conf/kojibuilder +++ b/roles/base/files/resolv.conf/kojibuilder @@ -1,4 +1,4 @@ -search phx2.fedoraproject.org vpn.fedoraproject.org fedoraproject.org -nameserver 10.5.126.21 -nameserver 10.5.126.22 +search iad2.fedoraproject.org vpn.fedoraproject.org fedoraproject.org +nameserver 10.3.163.33 +nameserver 10.3.163.34 options rotate timeout:1