From 09c58e7b75fb36b28f726f3f90ebacdc0f3323ab Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Wed, 17 Feb 2021 19:12:09 -0500 Subject: [PATCH] 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