From 09c58e7b75fb36b28f726f3f90ebacdc0f3323ab Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Wed, 17 Feb 2021 19:12:09 -0500 Subject: [PATCH 1/7] Try to get virthosts to use correct postfix set. For some reason the vmhost-x86-copr systems are not using the correct main.cf even though we have told the variables which one to use. I am trying a second method to try and force this, but will have to come up with a different datacenter definition for these otherwise as I can't figure out why the code is different. --- inventory/group_vars/vmhost_copr | 4 +++- .../host_vars/vmhost-x86-copr01.rdu-cc.fedoraproject.org | 1 - .../host_vars/vmhost-x86-copr02.rdu-cc.fedoraproject.org | 1 - .../host_vars/vmhost-x86-copr03.rdu-cc.fedoraproject.org | 1 - .../host_vars/vmhost-x86-copr04.rdu-cc.fedoraproject.org | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/inventory/group_vars/vmhost_copr b/inventory/group_vars/vmhost_copr index 4b13d09f94..bf10e9a709 100644 --- a/inventory/group_vars/vmhost_copr +++ b/inventory/group_vars/vmhost_copr @@ -12,7 +12,9 @@ nrpe_procs_crit: 1500 # See http://infrastructure.fedoraproject.org/csi/security-policy/ vpn: false -postfix_group: cloud +postfix_group: copr +postfix_maincf: "postfix/main.cf/main.cf.copr" + freezes: false csi_security_category: High diff --git a/inventory/host_vars/vmhost-x86-copr01.rdu-cc.fedoraproject.org b/inventory/host_vars/vmhost-x86-copr01.rdu-cc.fedoraproject.org index 70dd2c1a51..d7424de8b4 100644 --- a/inventory/host_vars/vmhost-x86-copr01.rdu-cc.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-copr01.rdu-cc.fedoraproject.org @@ -1,6 +1,5 @@ --- datacenter: rdu-cc -postfix_maincf: "postfix/main.cf/main.cf.copr" gw: 8.43.85.254 dns: 8.8.8.8 diff --git a/inventory/host_vars/vmhost-x86-copr02.rdu-cc.fedoraproject.org b/inventory/host_vars/vmhost-x86-copr02.rdu-cc.fedoraproject.org index dbbb2108db..29f4fee4c6 100644 --- a/inventory/host_vars/vmhost-x86-copr02.rdu-cc.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-copr02.rdu-cc.fedoraproject.org @@ -1,6 +1,5 @@ --- datacenter: rdu-cc -postfix_maincf: "postfix/main.cf/main.cf.copr" gw: 8.43.85.254 dns: 8.8.8.8 diff --git a/inventory/host_vars/vmhost-x86-copr03.rdu-cc.fedoraproject.org b/inventory/host_vars/vmhost-x86-copr03.rdu-cc.fedoraproject.org index 19b9a8c1c9..2e95ed3b82 100644 --- a/inventory/host_vars/vmhost-x86-copr03.rdu-cc.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-copr03.rdu-cc.fedoraproject.org @@ -1,6 +1,5 @@ --- datacenter: rdu-cc -postfix_maincf: "postfix/main.cf/main.cf.copr" gw: 8.43.85.254 dns: 8.8.8.8 diff --git a/inventory/host_vars/vmhost-x86-copr04.rdu-cc.fedoraproject.org b/inventory/host_vars/vmhost-x86-copr04.rdu-cc.fedoraproject.org index 79a73ad88c..22b7475c97 100644 --- a/inventory/host_vars/vmhost-x86-copr04.rdu-cc.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-copr04.rdu-cc.fedoraproject.org @@ -1,6 +1,5 @@ --- datacenter: rdu-cc -postfix_maincf: "postfix/main.cf/main.cf.copr" gw: 8.43.85.254 dns: 8.8.8.8 From 6da553c3087c7c767474919b1428270913e17340 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Wed, 17 Feb 2021 19:17:50 -0500 Subject: [PATCH 2/7] Fix tasks/postfix.yaml and roles/basic/tasks/postfix.yaml to match Found the reason that the definitions I had put were not working. There were two different ones and i was looking at the wrong one. Put the two tasks with the same logic so things should work no matter which one is run. --- roles/base/tasks/postfix.yml | 2 ++ tasks/postfix_basic.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/roles/base/tasks/postfix.yml b/roles/base/tasks/postfix.yml index c13104c4f1..a5f7524baf 100644 --- a/roles/base/tasks/postfix.yml +++ b/roles/base/tasks/postfix.yml @@ -1,6 +1,8 @@ - name: /etc/postfix/main.cf copy: src={{ item }} dest=/etc/postfix/main.cf with_first_found: + - "{{ postfix_maincf }}" + - "postfix/main.cf/main.cf.{{ ansible_fqdn }}" - "postfix/main.cf/main.cf.{{ inventory_hostname }}" - "postfix/main.cf/main.cf.{{ host_group }}" - "postfix/main.cf/main.cf.{{ postfix_group }}" diff --git a/tasks/postfix_basic.yml b/tasks/postfix_basic.yml index 2688861d4e..4bd6a7dcb1 100644 --- a/tasks/postfix_basic.yml +++ b/tasks/postfix_basic.yml @@ -12,6 +12,7 @@ - "{{ roles_path }}/base/files/postfix/main.cf/main.cf.{{ inventory_hostname }}" - "{{ roles_path }}/base/files/postfix/main.cf/main.cf.{{ host_group }}" - "{{ roles_path }}/base/files/postfix/main.cf/main.cf.{{ postfix_group }}" + - "{{ roles_path }}/base/files/postfix/main.cf/main.cf.{{ datacenter }}" - "{{ roles_path }}/base/files/postfix/main.cf/main.cf" notify: - restart postfix From 55567601c074422c692c4435494605da131c0bd3 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Thu, 18 Feb 2021 16:20:51 -0500 Subject: [PATCH 3/7] Bring up new Lenovo and Dell systems in IAD2 This starts adding in the general host_vars and changes to dhcpd.conf needed to bring up buildhw boxes and new staging servers. --- .../buildhw-a64-21.iad2.fedoraproject.org | 43 +++++++ .../buildhw-a64-22.iad2.fedoraproject.org | 43 +++++++ .../buildhw-a64-23.iad2.fedoraproject.org | 43 +++++++ .../buildhw-a64-24.iad2.fedoraproject.org | 43 +++++++ .../bvmhost-x86-04.stg.iad2.fedoraproject.org | 44 +++++++ .../bvmhost-x86-05.stg.iad2.fedoraproject.org | 44 +++++++ .../vmhost-x86-11.stg.iad2.fedoraproject.org | 42 +++++++ .../vmhost-x86-12.stg.iad2.fedoraproject.org | 42 +++++++ .../dhcpd.conf.noc01.iad2.fedoraproject.org | 107 +++++++++++++++++- 9 files changed, 446 insertions(+), 5 deletions(-) create mode 100644 inventory/host_vars/buildhw-a64-21.iad2.fedoraproject.org create mode 100644 inventory/host_vars/buildhw-a64-22.iad2.fedoraproject.org create mode 100644 inventory/host_vars/buildhw-a64-23.iad2.fedoraproject.org create mode 100644 inventory/host_vars/buildhw-a64-24.iad2.fedoraproject.org create mode 100644 inventory/host_vars/bvmhost-x86-04.stg.iad2.fedoraproject.org create mode 100644 inventory/host_vars/bvmhost-x86-05.stg.iad2.fedoraproject.org create mode 100644 inventory/host_vars/vmhost-x86-11.stg.iad2.fedoraproject.org create mode 100644 inventory/host_vars/vmhost-x86-12.stg.iad2.fedoraproject.org diff --git a/inventory/host_vars/buildhw-a64-21.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-21.iad2.fedoraproject.org new file mode 100644 index 0000000000..73b11d7f8b --- /dev/null +++ b/inventory/host_vars/buildhw-a64-21.iad2.fedoraproject.org @@ -0,0 +1,43 @@ +--- +freezes: true +nested: true +dns1: 10.3.163.33 +dns2: 10.3.163.34 + +has_ipv4: yes +eth1_ipv4: 10.3.170.147 +eth1_ipv4_nm: 24 +eth1_ipv4_gw: 10.3.170.254 + +mgmt_mac: "e8:6a:64:39:18:ef" +mgmt_ipv4: "10.3.160.114" +mac0: 68:05:ca:8e:9b:86 +mac1: 50:6b:4b:6a:b6:20 +mac2: 50:6b:4b:6a:b6:21 + +network_connections: + - name: eth0 + mac: "{{ mac0 }}" + type: ethernet + autoconnect: no + - name: eth1 + state: up + type: ethernet + autoconnect: yes + mac: "{{ mac1 }}" + ip: + address: + - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}" + gateway4: "{{ eth1_ipv4_gw }}" + dns: + - "{{ dns1 }}" + - "{{ dns2 }}" + dns_search: + - iad2.fedoraproject.org + - fedoraproject.org + dhcp4: no + auto6: no + - name: eth2 + mac: "{{ mac2 }}" + type: ethernet + autoconnect: no diff --git a/inventory/host_vars/buildhw-a64-22.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-22.iad2.fedoraproject.org new file mode 100644 index 0000000000..b81093c6fe --- /dev/null +++ b/inventory/host_vars/buildhw-a64-22.iad2.fedoraproject.org @@ -0,0 +1,43 @@ +--- +freezes: true + +dns1: 10.3.163.33 +dns2: 10.3.163.34 + +has_ipv4: yes +eth1_ipv4: 10.3.170.148 +eth1_ipv4_nm: 24 +eth1_ipv4_gw: 10.3.170.254 + +mgmt_mac: "E8:6A:64:39:18:73" +mgmt_ipv4: "10.3.160.116" +mac0: 68:05:ca:8a:f0:29 +mac1: 50:6b:4b:6a:eb:b0 +mac2: 50:6b:4b:6a:eb:b1 + +network_connections: + - name: eth0 + mac: "{{ mac0 }}" + type: ethernet + autoconnect: no + - name: eth1 + state: up + type: ethernet + autoconnect: yes + mac: "{{ mac1 }}" + ip: + address: + - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}" + gateway4: "{{ eth1_ipv4_gw }}" + dns: + - "{{ dns1 }}" + - "{{ dns2 }}" + dns_search: + - iad2.fedoraproject.org + - fedoraproject.org + dhcp4: no + auto6: no + - name: eth2 + mac: "{{ mac2 }}" + type: ethernet + autoconnect: no diff --git a/inventory/host_vars/buildhw-a64-23.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-23.iad2.fedoraproject.org new file mode 100644 index 0000000000..a317f34a42 --- /dev/null +++ b/inventory/host_vars/buildhw-a64-23.iad2.fedoraproject.org @@ -0,0 +1,43 @@ +--- +freezes: true + +dns1: 10.3.163.33 +dns2: 10.3.163.34 + +has_ipv4: yes +eth1_ipv4: 10.3.170.149 +eth1_ipv4_nm: 24 +eth1_ipv4_gw: 10.3.170.254 + +mgmt_mac: "E8:6A:64:39:19:67" +mgmt_ipv4: "10.3.160.117" +mac0: 00:1b:21:dc:4e:32 +mac1: 50:6b:4b:6a:ea:60 +mac2: 50:6b:4b:6a:ea:61 + +network_connections: + - name: eth0 + mac: "{{ mac0 }}" + type: ethernet + autoconnect: no + - name: eth1 + state: up + type: ethernet + autoconnect: yes + mac: "{{ mac1 }}" + ip: + address: + - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}" + gateway4: "{{ eth1_ipv4_gw }}" + dns: + - "{{ dns1 }}" + - "{{ dns2 }}" + dns_search: + - iad2.fedoraproject.org + - fedoraproject.org + dhcp4: no + auto6: no + - name: eth2 + mac: "{{ mac2 }}" + type: ethernet + autoconnect: no diff --git a/inventory/host_vars/buildhw-a64-24.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-24.iad2.fedoraproject.org new file mode 100644 index 0000000000..ebc6145993 --- /dev/null +++ b/inventory/host_vars/buildhw-a64-24.iad2.fedoraproject.org @@ -0,0 +1,43 @@ +--- +freezes: true +nested: true +dns1: 10.3.163.33 +dns2: 10.3.163.34 + +has_ipv4: yes +eth1_ipv4: 10.3.170.150 +eth1_ipv4_nm: 24 +eth1_ipv4_gw: 10.3.170.254 + +mgmt_mac: "E8:6A:64:39:19:67" +mgmt_ipv4: "10.3.160.118" +mac0: 68:05:CA:8E:98:C7 +mac1: 50:6B:4B:6A:C4:90 +mac2: 50:6B:4B:6A:C4:91 + +network_connections: + - name: eth0 + mac: "{{ mac0 }}" + type: ethernet + autoconnect: no + - name: eth1 + state: up + type: ethernet + autoconnect: yes + mac: "{{ mac1 }}" + ip: + address: + - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}" + gateway4: "{{ eth1_ipv4_gw }}" + dns: + - "{{ dns1 }}" + - "{{ dns2 }}" + dns_search: + - iad2.fedoraproject.org + - fedoraproject.org + dhcp4: no + auto6: no + - name: eth2 + mac: "{{ mac2 }}" + type: ethernet + autoconnect: no diff --git a/inventory/host_vars/bvmhost-x86-04.stg.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-04.stg.iad2.fedoraproject.org new file mode 100644 index 0000000000..6841c74ff4 --- /dev/null +++ b/inventory/host_vars/bvmhost-x86-04.stg.iad2.fedoraproject.org @@ -0,0 +1,44 @@ +--- +# This virthost only has stg instances, so it doesn't freeze +freezes: false +nested: true +dns1: 10.3.163.33 +dns2: 10.3.163.34 + +has_ipv4: yes +br0_ipv4: 10.3.167.14 +br0_ipv4_nm: 24 +br0_ipv4_gw: 10.3.167.254 + +mgmt_mac: "B8:2A:72:FC:EE:68" +mgmt_ipv4: 10.3.160.199 +mac1: EC:F4:BB:D2:8F:00 +mac2: EC:F4:BB:D2:8F:02 +mac3: EC:F4:BB:D2:8F:04 +mac4: EC:F4:BB:D2:8F:05 + +br0_port0_mac: "{{ mac1 }}" + +network_connections: + - name: br0 + state: up + type: bridge + autoconnect: yes + ip: + address: + - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" + gateway4: "{{ br0_ipv4_gw }}" + dns: + - "{{ dns1 }}" + - "{{ dns2 }}" + dns_search: + - stg.iad2.fedoraproject.org + - iad2.fedoraproject.org + - 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/bvmhost-x86-05.stg.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-05.stg.iad2.fedoraproject.org new file mode 100644 index 0000000000..67f2f0f584 --- /dev/null +++ b/inventory/host_vars/bvmhost-x86-05.stg.iad2.fedoraproject.org @@ -0,0 +1,44 @@ +--- +# This virthost only has stg instances, so it doesn't freeze +freezes: false +nested: true +dns1: 10.3.163.33 +dns2: 10.3.163.34 + +has_ipv4: yes +br0_ipv4: 10.3.167.17 +br0_ipv4_nm: 24 +br0_ipv4_gw: 10.3.167.254 + +mgmt_mac: "2c:ea:7f:f3:58:4e" +mgmt_ipv4: 10.3.160.157 +mac1: E4:43:4B:F7:AC:CC +mac2: E4:43:4B:F7:AC:CE +mac3: E4:43:4B:F7:AC:EC +mac4: E4:43:4B:F7:AC:ED + +br0_port0_mac: "{{ mac1 }}" + +network_connections: + - name: br0 + state: up + type: bridge + autoconnect: yes + ip: + address: + - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" + gateway4: "{{ br0_ipv4_gw }}" + dns: + - "{{ dns1 }}" + - "{{ dns2 }}" + dns_search: + - stg.iad2.fedoraproject.org + - iad2.fedoraproject.org + - 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-11.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-11.stg.iad2.fedoraproject.org new file mode 100644 index 0000000000..0b1754cf2a --- /dev/null +++ b/inventory/host_vars/vmhost-x86-11.stg.iad2.fedoraproject.org @@ -0,0 +1,42 @@ +--- +# This virthost only has stg instances, so it doesn't freeze +freezes: false +nested: true +dns: 10.3.163.33 + +has_ipv4: yes +br0_ipv4: 10.3.166.28 +br0_ipv4_nm: 24 +br0_ipv4_gw: 10.3.166.254 + +mgmt_mac: 2c:ea:7f:f3:6c:be +mgmt_ipv4: 10.3.160.46 +mac1: E4:43:4B:F7:B7:B8 +mac2: E4:43:4B:F7:B7:BA +mac3: E4:43:4B:F7:B7:D8 +mac4: E4:43:4B:F7:B7:D9 + +br0_port0_mac: "{{ mac1 }}" + +network_connections: + - name: br0 + state: up + type: bridge + autoconnect: yes + ip: + address: + - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" + gateway4: "{{ br0_ipv4_gw }}" + dns: + - "{{ dns }}" + dns_search: + - stg.iad2.fedoraproject.org + - iad2.fedoraproject.org + - 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-12.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-12.stg.iad2.fedoraproject.org new file mode 100644 index 0000000000..2c4f026015 --- /dev/null +++ b/inventory/host_vars/vmhost-x86-12.stg.iad2.fedoraproject.org @@ -0,0 +1,42 @@ +--- +# This virthost only has stg instances, so it doesn't freeze +freezes: false +nested: true +dns: 10.3.163.33 + +has_ipv4: yes +br0_ipv4: 10.3.166.29 +br0_ipv4_nm: 24 +br0_ipv4_gw: 10.3.166.254 + +mgmt_mac: 2c:ea:7f:f3:82:fc +mgmt_ipv4: 10.3.160.47 +mac1: E4:43:4B:F7:AD:10 +mac2: E4:43:4B:F7:AD:12 +mac3: E4:43:4B:F7:AD:30 +mac4: E4:43:4B:F7:AD:31 + +br0_port0_mac: "{{ mac1 }}" + +network_connections: + - name: br0 + state: up + type: bridge + autoconnect: yes + ip: + address: + - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}" + gateway4: "{{ br0_ipv4_gw }}" + dns: + - "{{ dns }}" + dns_search: + - stg.iad2.fedoraproject.org + - iad2.fedoraproject.org + - fedoraproject.org + dhcp4: no + auto6: no + - name: br0-port0 + state: up + type: ethernet + master: br0 + mac: "{{ br0_port0_mac }}" diff --git a/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org index 78aa8bc41e..5103621abd 100644 --- a/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org +++ b/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org @@ -630,6 +630,33 @@ host vmhost-x86-10-stg { option subnet-mask 255.255.255.0; } +host vmhost-x86-11-stg-mgmt { + hardware ethernet 2c:ea:7f:f3:6c:be; + fixed-address 10.3.160.46; + option host-name "vmhost-x86-11-stg"; +} +host vmhost-x86-11-stg { + hardware ethernet E4:43:4B:F7:B7:B8; + fixed-address 10.3.166.28; + filename "uefi/grubx64.efi"; + next-server 10.3.163.10; + option routers 10.3.166.254; + option subnet-mask 255.255.255.0; +} + +host vmhost-x86-12-stg-mgmt { + hardware ethernet 2c:ea:7f:f3:82:fc; + fixed-address 10.3.160.47; + option host-name "vmhost-x86-12-stg"; +} +host vmhost-x86-12-stg { + hardware ethernet E4:43:4B:F7:AD:10; + fixed-address 10.3.166.29; + filename "uefi/grubx64.efi"; + next-server 10.3.163.10; + option routers 10.3.166.254; + option subnet-mask 255.255.255.0; +} host bvmhost-x86-01-stg { hardware ethernet 24:6E:96:B1:56:20; @@ -655,6 +682,12 @@ host bvmhost-x86-03-stg { option routers 10.3.167.254; option subnet-mask 255.255.255.0; } + +host bvmhost-x86-04-stg-mgmt { + hardware ethernet B8:2A:72:FC:EE:68; + fixed-address 10.3.160.199; + option host-name "bvmhost-x86-04-stg-mgmt"; +} host bvmhost-x86-04-stg { hardware ethernet EC:F4:BB:D2:8F:00; fixed-address 10.3.167.14; @@ -664,6 +697,19 @@ host bvmhost-x86-04-stg { option subnet-mask 255.255.255.0; } +host bvmhost-x86-05-stg-mgmt { + hardware ethernet 2c:ea:7f:f3:58:4e; + fixed-address 10.3.160.157; + option host-name "bvmhost-x86-05-stg"; +} +host bvmhost-x86-05-stg { + hardware ethernet E4:43:4B:F7:AC:CC; + fixed-address 10.3.167.17; + filename "uefi/grubx64.efi"; + next-server 10.3.163.10; + option routers 10.3.166.254; + option subnet-mask 255.255.255.0; +} # Build network @@ -1028,6 +1074,62 @@ host buildhw-a64-11 { option routers 10.3.170.254; option host-name "buildhw-a64-11"; } + +host buildhw-a64-21-mgmt { + hardware ethernet e8:6a:64:39:18:ef; + fixed-address 10.3.160.114; + option host-name "bvmhost-a64-21-mgmt"; +} +host buildhw-a64-21 { + hardware ethernet 50:6b:4b:6a:b6:20 ; + fixed-address 10.3.170.147; + filename "uefi/grubaa64.efi"; + next-server 10.3.163.10; + option routers 10.3.170.254; + option subnet-mask 255.255.255.0; +} +host buildhw-a64-22-mgmt { + hardware ethernet E8:6A:64:39:18:73; + fixed-address 10.3.160.116; + option host-name "bvmhost-a64-22-mgmt"; +} +host buildhw-a64-22 { + hardware ethernet 50:6b:4b:6a:eb:b0 ; + fixed-address 10.3.170.148; + filename "uefi/grubaa64.efi"; + next-server 10.3.163.10; + option routers 10.3.170.254; + option subnet-mask 255.255.255.0; +} +host buildhw-a64-23-mgmt { + hardware ethernet E8:6A:64:39:19:67; + fixed-address 10.3.160.117; + option host-name "bvmhost-a64-23-mgmt"; +} +host buildhw-a64-23 { + hardware ethernet 50:6b:4b:6a:ea:60; + fixed-address 10.3.170.149; + filename "uefi/grubaa64.efi"; + next-server 10.3.163.10; + option routers 10.3.170.254; + option subnet-mask 255.255.255.0; +} +host buildhw-a64-24-mgmt { + hardware ethernet E8:6A:64:39:19:67; + fixed-address 10.3.160.118; + option host-name "bvmhost-a64-24-mgmt"; +} +host buildhw-a64-24 { + hardware ethernet 50:6B:4B:6A:C4:90 ; + fixed-address 10.3.170.150; + filename "uefi/grubaa64.efi"; + next-server 10.3.163.10; + option routers 10.3.170.254; + option subnet-mask 255.255.255.0; +} + + + host bkernel02 { hardware ethernet d0:94:66:45:8c:0f; option routers 10.3.169.254; @@ -1490,11 +1592,6 @@ host dell-630-01-mgmt { fixed-address 10.3.160.191; option host-name "bvirthost14"; } -host system-vmhost-mgmt { - hardware ethernet B8:2A:72:FC:EE:68; - fixed-address 10.3.160.199; - option host-name "vmhost-11-mgmt"; -} host dell-r6x0-16-mgmt { hardware ethernet 58:8A:5A:EE:F2:0E; From ec69619a51519c33adf8d2cfcf395c680c9f8619 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Thu, 18 Feb 2021 17:36:25 -0500 Subject: [PATCH 4/7] Fix inventory/hardware to have correct hostname for vmhost-x86-05 to vmhost-x86-cc05 --- inventory/hardware | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inventory/hardware b/inventory/hardware index 8df8b66bc1..fd374deafa 100644 --- a/inventory/hardware +++ b/inventory/hardware @@ -8,8 +8,8 @@ virthost-rdu01.fedoraproject.org #virthost-rdu02.fedoraproject.org virthost-cc-rdu01.fedoraproject.org virthost-cc-rdu02.fedoraproject.org -vmhost-x86-05.rdu-cc.fedoraproject.org -vmhost-x86-06.rdu-cc.fedoraproject.org +vmhost-x86-cc05.rdu-cc.fedoraproject.org +vmhost-x86-cc06.rdu-cc.fedoraproject.org vmhost-x86-copr01.rdu-cc.fedoraproject.org vmhost-x86-copr02.rdu-cc.fedoraproject.org vmhost-x86-copr03.rdu-cc.fedoraproject.org From ac514f96e46267b98630f649d1cc5b0047c7c69f Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Thu, 18 Feb 2021 17:40:17 -0500 Subject: [PATCH 5/7] Fix inventory/hardware to remove bvmhost-p08-03 so nagios will work --- inventory/builders | 1 - inventory/hardware | 1 - 2 files changed, 2 deletions(-) diff --git a/inventory/builders b/inventory/builders index ad91243d0e..f748743efa 100644 --- a/inventory/builders +++ b/inventory/builders @@ -187,7 +187,6 @@ bvmhost-p09-01.iad2.fedoraproject.org bvmhost-p09-02.iad2.fedoraproject.org bvmhost-p09-03.iad2.fedoraproject.org bvmhost-p09-04.iad2.fedoraproject.org -bvmhost-p08-03.iad2.fedoraproject.org bvmhost-p08-01.stg.iad2.fedoraproject.org [buildhw] diff --git a/inventory/hardware b/inventory/hardware index fd374deafa..ab339e04c5 100644 --- a/inventory/hardware +++ b/inventory/hardware @@ -80,7 +80,6 @@ bvmhost-p09-02.iad2.fedoraproject.org bvmhost-p09-03.iad2.fedoraproject.org bvmhost-p09-04.iad2.fedoraproject.org openqa-p09-worker01.iad2.fedoraproject.org -bvmhost-p08-03.iad2.fedoraproject.org bvmhost-p08-01.stg.iad2.fedoraproject.org [appliedmicro] From 43751b84030dde80259703b9a60f47dc32c3b851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Fri, 19 Feb 2021 14:45:22 +0100 Subject: [PATCH 6/7] oraculum: use master branch for frontend build --- roles/openshift-apps/oraculum/templates/buildconfig.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/openshift-apps/oraculum/templates/buildconfig.yml b/roles/openshift-apps/oraculum/templates/buildconfig.yml index 87f5fb17a9..ee807f88dd 100644 --- a/roles/openshift-apps/oraculum/templates/buildconfig.yml +++ b/roles/openshift-apps/oraculum/templates/buildconfig.yml @@ -41,7 +41,7 @@ spec: type: Git git: uri: 'https://pagure.io/fedora-qa/packager_dashboard.git' - ref: 'docker_stuff' + ref: 'master' strategy: type: Docker dockerStrategy: From 2496090121558a806ac400a2d0e5323af1077728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Fri, 19 Feb 2021 14:59:49 +0100 Subject: [PATCH 7/7] oraculum: try frontend build from git --- .../oraculum/templates/deploymentconfig.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/openshift-apps/oraculum/templates/deploymentconfig.yml b/roles/openshift-apps/oraculum/templates/deploymentconfig.yml index 2beffb1c9f..beb792ccb2 100644 --- a/roles/openshift-apps/oraculum/templates/deploymentconfig.yml +++ b/roles/openshift-apps/oraculum/templates/deploymentconfig.yml @@ -410,8 +410,8 @@ spec: deploymentconfig: oraculum-frontend spec: containers: - - name: packager-dashboard-frontend - image: packager-dashboard-frontend:latest + - name: oraculum-frontend + image: oraculum-frontend:latest resources: {} env: - name: SUBDIR @@ -428,7 +428,7 @@ spec: imageChangeParams: automatic: true containerNames: - - packager-dashboard-frontend + - oraculum-frontend from: kind: ImageStreamTag - name: packager-dashboard-frontend:latest \ No newline at end of file + name: oraculum-frontend:latest \ No newline at end of file