From 58646b864bcf1df88aa5d8362373a821529dd75b Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Feb 17 2021 23:12:06 +0000 Subject: fix the hostnames for rdu-cc systems due to some unknown playbooks assuming that {{ env }}.iad2 is anything named vmhost-x86 --- diff --git a/inventory/host_vars/vmhost-x86-05.rdu-cc.fedoraproject.org b/inventory/host_vars/vmhost-x86-05.rdu-cc.fedoraproject.org deleted file mode 100644 index 4deb9fe..0000000 --- a/inventory/host_vars/vmhost-x86-05.rdu-cc.fedoraproject.org +++ /dev/null @@ -1,56 +0,0 @@ ---- -datacenter: rdu-cc - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -vpn: true -postfix_group: cloud -freezes: false - -gw: 8.43.85.254 -dns: 8.8.8.8 - -has_ipv4: yes -br0_ipv4: 8.43.85.84 -br0_ipv4_nm: 23 -br0_ipv4_gw: "{{ gw }}" - -has_ipv6: yes -br0_ipv6: "2620:52:3:1:dead:beef:cafe:f005" -br0_ipv6_nm: 64 -br0_ipv6_gw: "2620:52:3:1:ffff:ffff:ffff:fffe" - -mac0: "ec:f4:bb:d2:97:7c" -mac1: "ec:f4:bb:d2:97:7d" -mac2: "ec:f4:bb:d2:97:78" -mac3: "ec:f4:bb:d2:97:7a" - -br0_port0_mac: "{{ mac0 }}" - -network_connections: - - name: br0 - state: up - type: bridge - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - - "{{ br0_ipv6 }}/{{ br0_ipv6_nm }}" - gateway4: "{{ br0_ipv4_gw }}" - gateway6: "{{ br0_ipv6_gw }}" - dns: - - 8.8.8.8 - - 8.8.4.4 - - 2001:4860:4860::8888 - dns_search: - - fedoraproject.org - - vpn.fedoraproject.org - - rdu-cc.fedoraproject.org - dhcp4: no - auto6: no - - name: br0-port0 - state: up - type: ethernet - master: br0 - mac: "{{ br0_port0_mac }}" diff --git a/inventory/host_vars/vmhost-x86-06.rdu-cc.fedoraproject.org b/inventory/host_vars/vmhost-x86-06.rdu-cc.fedoraproject.org deleted file mode 100644 index e82a83a..0000000 --- a/inventory/host_vars/vmhost-x86-06.rdu-cc.fedoraproject.org +++ /dev/null @@ -1,56 +0,0 @@ ---- -datacenter: rdu-cc - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -vpn: true -postfix_group: cloud -freezes: false - -gw: 8.43.85.254 -dns: 8.8.8.8 - -has_ipv4: yes -br0_ipv4: 8.43.85.85 -br0_ipv4_nm: 23 -br0_ipv4_gw: "{{ gw }}" - -has_ipv6: yes -br0_ipv6: "2620:52:3:1:dead:beef:cafe:f006" -br0_ipv6_nm: 64 -br0_ipv6_gw: "2620:52:3:1:ffff:ffff:ffff:fffe" - -mac0: "ec:f4:bb:cd:aa:a4" -mac1: "ec:f4:bb:cd:aa:a5" -mac2: "ec:f4:bb:cd:aa:a0" -mac3: "ec:f4:bb:cd:aa:a2" - -br0_port0_mac: "{{ mac0 }}" - -network_connections: - - name: br0 - state: up - type: bridge - autoconnect: yes - ip: - address: - - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" - - "{{ br0_ipv6 }}/{{ br0_ipv6_nm }}" - gateway4: "{{ br0_ipv4_gw }}" - gateway6: "{{ br0_ipv6_gw }}" - dns: - - 8.8.8.8 - - 8.8.4.4 - - 2001:4860:4860::8888 - dns_search: - - fedoraproject.org - - vpn.fedoraproject.org - - rdu-cc.fedoraproject.org - dhcp4: no - auto6: no - - name: br0-port0 - state: up - type: ethernet - master: br0 - mac: "{{ br0_port0_mac }}" diff --git a/inventory/host_vars/vmhost-x86-cc05.rdu-cc.fedoraproject.org b/inventory/host_vars/vmhost-x86-cc05.rdu-cc.fedoraproject.org new file mode 100644 index 0000000..4deb9fe --- /dev/null +++ b/inventory/host_vars/vmhost-x86-cc05.rdu-cc.fedoraproject.org @@ -0,0 +1,56 @@ +--- +datacenter: rdu-cc + +nrpe_procs_warn: 900 +nrpe_procs_crit: 1000 + +vpn: true +postfix_group: cloud +freezes: false + +gw: 8.43.85.254 +dns: 8.8.8.8 + +has_ipv4: yes +br0_ipv4: 8.43.85.84 +br0_ipv4_nm: 23 +br0_ipv4_gw: "{{ gw }}" + +has_ipv6: yes +br0_ipv6: "2620:52:3:1:dead:beef:cafe:f005" +br0_ipv6_nm: 64 +br0_ipv6_gw: "2620:52:3:1:ffff:ffff:ffff:fffe" + +mac0: "ec:f4:bb:d2:97:7c" +mac1: "ec:f4:bb:d2:97:7d" +mac2: "ec:f4:bb:d2:97:78" +mac3: "ec:f4:bb:d2:97:7a" + +br0_port0_mac: "{{ mac0 }}" + +network_connections: + - name: br0 + state: up + type: bridge + autoconnect: yes + ip: + address: + - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" + - "{{ br0_ipv6 }}/{{ br0_ipv6_nm }}" + gateway4: "{{ br0_ipv4_gw }}" + gateway6: "{{ br0_ipv6_gw }}" + dns: + - 8.8.8.8 + - 8.8.4.4 + - 2001:4860:4860::8888 + dns_search: + - fedoraproject.org + - vpn.fedoraproject.org + - rdu-cc.fedoraproject.org + dhcp4: no + auto6: no + - name: br0-port0 + state: up + type: ethernet + master: br0 + mac: "{{ br0_port0_mac }}" diff --git a/inventory/host_vars/vmhost-x86-cc06.rdu-cc.fedoraproject.org b/inventory/host_vars/vmhost-x86-cc06.rdu-cc.fedoraproject.org new file mode 100644 index 0000000..e82a83a --- /dev/null +++ b/inventory/host_vars/vmhost-x86-cc06.rdu-cc.fedoraproject.org @@ -0,0 +1,56 @@ +--- +datacenter: rdu-cc + +nrpe_procs_warn: 900 +nrpe_procs_crit: 1000 + +vpn: true +postfix_group: cloud +freezes: false + +gw: 8.43.85.254 +dns: 8.8.8.8 + +has_ipv4: yes +br0_ipv4: 8.43.85.85 +br0_ipv4_nm: 23 +br0_ipv4_gw: "{{ gw }}" + +has_ipv6: yes +br0_ipv6: "2620:52:3:1:dead:beef:cafe:f006" +br0_ipv6_nm: 64 +br0_ipv6_gw: "2620:52:3:1:ffff:ffff:ffff:fffe" + +mac0: "ec:f4:bb:cd:aa:a4" +mac1: "ec:f4:bb:cd:aa:a5" +mac2: "ec:f4:bb:cd:aa:a0" +mac3: "ec:f4:bb:cd:aa:a2" + +br0_port0_mac: "{{ mac0 }}" + +network_connections: + - name: br0 + state: up + type: bridge + autoconnect: yes + ip: + address: + - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" + - "{{ br0_ipv6 }}/{{ br0_ipv6_nm }}" + gateway4: "{{ br0_ipv4_gw }}" + gateway6: "{{ br0_ipv6_gw }}" + dns: + - 8.8.8.8 + - 8.8.4.4 + - 2001:4860:4860::8888 + dns_search: + - fedoraproject.org + - vpn.fedoraproject.org + - rdu-cc.fedoraproject.org + dhcp4: no + auto6: no + - name: br0-port0 + state: up + type: ethernet + master: br0 + mac: "{{ br0_port0_mac }}" diff --git a/inventory/inventory b/inventory/inventory index 158be93..93a537f 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -119,8 +119,8 @@ vmhost-x86-copr01.rdu-cc.fedoraproject.org vmhost-x86-copr02.rdu-cc.fedoraproject.org vmhost-x86-copr03.rdu-cc.fedoraproject.org vmhost-x86-copr04.rdu-cc.fedoraproject.org -vmhost-x86-06.rdu-cc.fedoraproject.org -vmhost-x86-05.rdu-cc.fedoraproject.org +vmhost-x86-cc06.rdu-cc.fedoraproject.org +vmhost-x86-cc05.rdu-cc.fedoraproject.org [datagrepper] datagrepper01.iad2.fedoraproject.org