Merge branch 'master' of ssh://pagure.io/fedora-infra/ansible

inventory/backups

@@ -19,5 +19,4 @@ db-qa03.qa.fedoraproject.org
 db-koji02.phx2.fedoraproject.org
 value01.phx2.fedoraproject.org
 tang01.phx2.fedoraproject.org
-taskotron01.qa.fedoraproject.org
 nuancier01.phx2.fedoraproject.org

inventory/inventory

@@ -1289,6 +1289,7 @@ retrace01.qa.fedoraproject.org
 
 [iad2]
 autosign01.iad2.fedoraproject.org
+backup01.iad2.fedoraproject.org
 bastion01.iad2.fedoraproject.org
 batcave01.iad2.fedoraproject.org
 blockerbugs01.iad2.fedoraproject.org

roles/haproxy/files/ipa.production-phx2.pem

@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQsFADA8MRowGAYDVQQKDBFGRURP
+UkFQUk9KRUNULk9SRzEeMBwGA1UEAwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MB4X
+DTE2MTAxMzEzMDQ0NloXDTM2MTAxMzEzMDQ0NlowPDEaMBgGA1UECgwRRkVET1JB
+UFJPSkVDVC5PUkcxHjAcBgNVBAMMFUNlcnRpZmljYXRlIEF1dGhvcml0eTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLFCPrsPD3YW/yzvId7UsWCq/Ac
+cD7IOtlt46slTa490TvfpwzB1IwA3H0LTEYV7LONMIxJIT8H4H2P7A/S4eDtA6sZ
+s26Qp+3YLj+jHOwvNiONG5YBIn6vgUKc1SdwyuQsNwcGsH1nV2vXrKYz4ccMud1P
+tzzwRMSWgwZLXcLvMMXYpDCxu4pVmgEtTnYz7Dii7MJ2aJsWEuslzjL6HjaegfGD
+JjXCrqmNKcgbgD7fQq05wiYw8AbArjhfObDO626b4naB0VxLb9vGTDBaRbIeL7Or
+nM11BWVqYAFFRZPL1jXkeb9Bpr9oj4PduRq6+tSZPa3wgtnoowAN2AqLHKMCAwEA
+AaOBsDCBrTAfBgNVHSMEGDAWgBQVrijBhrLB6xwkwjZroAlWJGIpvDAPBgNVHRMB
+Af8EBTADAQH/MA4GA1UdDwEB/wQEAwIBxjAdBgNVHQ4EFgQUFa4owYaywescJMI2
+a6AJViRiKbwwSgYIKwYBBQUHAQEEPjA8MDoGCCsGAQUFBzABhi5odHRwOi8vaXBh
+MDEucGh4Mi5mZWRvcmFwcm9qZWN0Lm9yZzo4MC9jYS9vY3NwMA0GCSqGSIb3DQEB
+CwUAA4IBAQAZE5ZVf2MROtRR2O00ecXwl3vBE72xw87EQdAQ6J9sDjug5YrVW6OU
+OfaRoVLyBSi5uPgj2RZ9VePdGNSDZ66DhspPtmbWcW0M1X2QPXwWQ/Idj3MfKE33
+b+V4A6T55p1kxXniNl0KZHlDVMECltwRBkd9mjr3LgWzk/EgqyiP56xrWEsvKUyv
+ZMvoyFky2/BaNTN8KOposjDQZwR5sqE/CJzm/QJPg/6zQ4/tkFDOc7ZqIVkfIqoY
+sycNYLLakqCV59xuJ2uDbV8Sn8LbH5+e3Px0mapnVxn8fJAPcCqDOmXJ5TVkVYlH
+nYYOskqEw5stHYuEwujR2uXo8vfmIMpZ
+-----END CERTIFICATE-----
+

roles/haproxy/files/os-master.production-iad2.pem

@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC6jCCAdKgAwIBAgIBATANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBtvcGVu
+c2hpZnQtc2lnbmVyQDE1ODk4MjEwODIwHhcNMjAwNTE4MTY1ODAxWhcNMjUwNTE3
+MTY1ODAyWjAmMSQwIgYDVQQDDBtvcGVuc2hpZnQtc2lnbmVyQDE1ODk4MjEwODIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwVl9/ZFwYKvginudHP+f7
+TFJgl45NWnmzc6aDPZDcCcfXZ1P8KtAa1GHBQ77ItJ5w2/lNx5PWoQAyAJrddXSZ
+NlPxteLQe0c31rgR0++/UFFmcAnQ7WncBsPxJPFrFSEU5FF3faY5p9lGTVcwxvi3
+4eEKj9d3Yupr4osxeKaHwAM7r4Oq1iVApLsliNMXbXX0w7ihf3RPQonOoCK0oa+l
+4DDdoCzARTi2q+H1tm5SmfJRpEXwaYOqTCH/Od1HbL+YmdJFoqfhcjEn+Bzg6VdR
+U+MDNx71MQ3sROOpejyH51iZ0QK75zv1RtTIeylGGDa94g5tbRb7a5FJgRe39/jZ
+AgMBAAGjIzAhMA4GA1UdDwEB/wQEAwICpDAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
+SIb3DQEBCwUAA4IBAQB99T9a8/ZLnDmWZopX8Jhgv8umqNVW8nhgFOlFOJ6YsiXs
+p9fDIUSU5m1/ZEJv0NIMMorLG49SoAxWrh4LwzlPc5fAT6PwHEZQRAAfu4oNjGzI
+1KkERtyJqb+8KUFflTUQZubOBeK8enp9t2oSqnmFTN1NvMHAjuDYLqL2/pRqAdxx
+vlRcqgyEoGRf98dX4tFrO1sTd6ivadOjITzRFJTXihR+DahV4a06nJYAbT52rLJJ
+czzA/7vXY1XRUbRNtnPOI57b6Y/R/XQeWmX2C8TM8ogF/q+d7AG40LZB1xBJRNOY
+38lIpCfLG9PuQwwl6M76zgrrjaPwDEsk6VGOSEhI
+-----END CERTIFICATE-----

roles/haproxy/tasks/main.yml

@@ -35,8 +35,8 @@
         dest={{ item.dest }}
         owner=root group=root mode=0600
   with_items:
-  - { file: "ipa.{{env}}.pem", dest: /etc/haproxy/ipa.pem }
+  - { file: "ipa.{{env}}-{{datacenter}}.pem", dest: /etc/haproxy/ipa.pem }
-  - { file: "os-master.{{env}}.pem", dest: /etc/haproxy/os-master.pem }
+  - { file: "os-master.{{env}}-{{datacenter}}.pem", dest: /etc/haproxy/os-master.pem }
   tags:
   - haproxy
 

roles/httpd/reverseproxy/templates/reversepassproxy.git.conf

@@ -42,7 +42,7 @@ ProxyPreserveHost On
 	Require valid-user
 </Location>
 
-{% if 'phx2' in inventory_hostname or if 'iad2' in inventory_hostname %}
+{% if datacenter == 'iad2' or datacenter == 'phx2' %}
 ProxyPass {{ localpath }} {{ proxyurl }}{{remotepath}}
 ProxyPassReverse {{ localpath }} {{ proxyurl }}{{remotepath}}
 {% else %}

roles/httpd/reverseproxy/templates/reversepassproxy.kojipkgs.conf

@@ -31,7 +31,7 @@ ProxyPreserveHost On
 {% endif %}
 
 
-{% if 'phx2' in inventory_hostname or if 'iad2' in inventory_hostname %}
+{% if datacenter == 'iad2' or datacenter == 'phx2' %}
 
 {% if balancer_name is defined %}
 <Proxy "balancer://{{balancer_name}}">

roles/httpd/reverseproxy/templates/reversepassproxy.nagios.conf

@@ -1,4 +1,4 @@
-{% if 'phx2' in inventory_hostname or if 'iad2' in inventory_hostname %}
+{% if datacenter == 'iad2' or datacenter == 'phx2' %}
 ProxyPass {{ localpath }} {{ proxyurl }}{{remotepath}}
 ProxyPassReverse {{ localpath }} {{ proxyurl }}{{remotepath}}
 {% else %}