diff --git a/inventory/builders b/inventory/builders index 168e0eb881..cc4a9f8e29 100644 --- a/inventory/builders +++ b/inventory/builders @@ -131,10 +131,14 @@ buildvm-s390x-27.s390.fedoraproject.org buildvm_s390x_zvm buildvm_s390x_kvm +[bvmhost-s390x] +bvmhost-s390x-01.stg.s390.fedoraproject.org + [buildvmhost] #buildvmhost-aarch64-01.arm.fedoraproject.org #buildvmhost-aarch64-02.arm.fedoraproject.org buildvmhost-s390x-01.s390.fedoraproject.org +bvmhost-s390x-01.stg.s390.fedoraproject.org # These are lenovo emags #buildvmhost-aarch64-10.arm.fedoraproject.org #buildvmhost-aarch64-11.arm.fedoraproject.org diff --git a/inventory/host_vars/buildvm-s390x-01.stg.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-01.stg.s390.fedoraproject.org index 00b765b317..11696add66 100644 --- a/inventory/host_vars/buildvm-s390x-01.stg.s390.fedoraproject.org +++ b/inventory/host_vars/buildvm-s390x-01.stg.s390.fedoraproject.org @@ -3,25 +3,11 @@ dns1: 10.3.163.33 dns2: 10.3.163.34 dns_search1: "iad2.fedoraproject.org" dns_search2: "fedoraproject.org" -enc900_ipv4_ip: 10.16.0.25 -enc900_ipv4_gw: 10.16.0.254 -enc900_ipv4_nm: 24 +eth0_ipv4_gw: 10.16.0.38 +eth0_ipv4_ip: 10.16.0.254 has_ipv4: yes -network_connections: - - autoconnect: yes - ip: - address: - - "{{ enc900_ipv4_ip }}/{{ enc900_ipv4_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ enc900_ipv4_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: enc900 - state: up - type: ethernet +lvm_size: 102400 +mem_size: 8192 +num_cpus: 2 varnish_group: s390kojipkgs +volgroup: /dev/fedora_rdu-z16-l52 diff --git a/inventory/host_vars/bvmhost-s390x-01.stg.s390.fedoraproject.org b/inventory/host_vars/bvmhost-s390x-01.stg.s390.fedoraproject.org new file mode 100644 index 0000000000..1333237e0d --- /dev/null +++ b/inventory/host_vars/bvmhost-s390x-01.stg.s390.fedoraproject.org @@ -0,0 +1,5 @@ +--- +dns1: 10.3.163.33 +dns2: 10.3.163.34 +dns_search1: iad2.fedoraproject.org +nbde: false diff --git a/inventory/inventory b/inventory/inventory index e7f9118b31..04f4c50bd8 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1151,6 +1151,7 @@ cloud_aws ibiblio_old_virt buildvm_s390x_zvm buildvm_s390x_stg +bvmhost-s390x [iad2:children] iad2_production diff --git a/roles/dns/files/named.conf b/roles/dns/files/named.conf index e3b683fd16..bae8017d53 100644 --- a/roles/dns/files/named.conf +++ b/roles/dns/files/named.conf @@ -20,7 +20,7 @@ acl "everyone" { 0.0.0.0/0; ::0/0; }; // acl "ns_redhat" { 66.187.233.210; 209.132.183.22; 209.132.183.30; 209.132.183.2; 66.187.229.10; }; // -acl "iad2net" { 10.3.160.0/19; 10.16.0.0/24; }; +acl "iad2net" { 10.3.160.0/19; 10.16.0.0/24; 10.1.102.0/24 }; acl "rdu2net" { 172.31.1.0/24; 172.31.2.0/24; }; acl "rh-slaves" { 10.11.5.70; }; acl "rh" { 10.0.0.0/8; }; @@ -210,6 +210,11 @@ view "IAD2" { file "/var/named/master/built/0.16.10.in-addr.arpa"; }; + zone "102.1.10.in-addr.arpa" { + type master; + file "/var/named/master/built/102.1.10.in-addr.arpa"; + }; + zone "2.31.172.in-addr.arpa" { type master; file "/var/named/master/built/2.31.172.in-addr.arpa";