diff --git a/files/2fa/pam_url.conf.cloud b/files/2fa/pam_url.conf.cloud deleted file mode 100644 index 9ce7690b81..0000000000 --- a/files/2fa/pam_url.conf.cloud +++ /dev/null @@ -1,21 +0,0 @@ -pam_url: -{ - settings: - { - url = "https://fas-all.phx2.fedoraproject.org:8443/"; # URI to fetch - returncode = "OK"; # The remote script/cgi should return a 200 http code and this string as its only results - userfield = "user"; # userfield name to send - passwdfield = "token"; # passwdfield name to send - extradata = "&do=login"; # extradata to send - prompt = "Password+Token: "; # password prompt - }; - - ssl: - { - verify_peer = true; # Should we verify SSL ? - verify_host = true; # Should we verify the CN in the SSL cert? - client_cert = "/etc/pki/tls/private/totpcgi.pem"; # file to use as client-side certificate - client_key = "/etc/pki/tls/private/totpcgi.pem"; # file to use as client-side key (can be same file as above if a single cert) - ca_cert = "/etc/pki/tls/private/totpcgi-ca.cert"; - }; -}; diff --git a/files/2fa/pam_url.conf.j2 b/files/2fa/pam_url.conf.j2 deleted file mode 100644 index 53de133ec2..0000000000 --- a/files/2fa/pam_url.conf.j2 +++ /dev/null @@ -1,27 +0,0 @@ -pam_url: -{ - settings: - { - {% if env == 'staging' %} - url = "https://fas-all.stg.phx2.fedoraproject.org:8443/"; # URI to fetch - {% elif datacenter == 'iad2' %} - url = "https://fas-all.iad2.fedoraproject.org:8443/"; # URI to fetch - {% else %} - url = "https://fas-all.vpn.fedoraproject.org:8443/"; # URI to fetch - {% endif %} - returncode = "OK"; # The remote script/cgi should return a 200 http code and this string as its only results - userfield = "user"; # userfield name to send - passwdfield = "token"; # passwdfield name to send - extradata = "&do=login"; # extradata to send - prompt = "Password+Token: "; # password prompt - }; - - ssl: - { - verify_peer = true; # Should we verify SSL ? - verify_host = true; # Should we verify the CN in the SSL cert? - client_cert = "/etc/pki/tls/private/totpcgi.pem"; # file to use as client-side certificate - client_key = "/etc/pki/tls/private/totpcgi.pem"; # file to use as client-side key (can be same file as above if a single cert) - ca_cert = "/etc/pki/tls/private/totpcgi-ca.cert"; - }; -}; diff --git a/files/2fa/pam_url.conf.stg.fedoraproject.org b/files/2fa/pam_url.conf.stg.fedoraproject.org deleted file mode 100644 index 508c5d9cf7..0000000000 --- a/files/2fa/pam_url.conf.stg.fedoraproject.org +++ /dev/null @@ -1,21 +0,0 @@ -pam_url: -{ - settings: - { - url = "https://fas-all.stg.phx2.fedoraproject.org:8443/"; # URI to fetch - returncode = "OK"; # The remote script/cgi should return a 200 http code and this string as its only results - userfield = "user"; # userfield name to send - passwdfield = "token"; # passwdfield name to send - extradata = "&do=login"; # extradata to send - prompt = "Password+Token: "; # password prompt - }; - - ssl: - { - verify_peer = true; # Should we verify SSL ? - verify_host = true; # Should we verify the CN in the SSL cert? - client_cert = "/etc/pki/tls/private/totpcgi.pem"; # file to use as client-side certificate - client_key = "/etc/pki/tls/private/totpcgi.pem"; # file to use as client-side key (can be same file as above if a single cert) - ca_cert = "/etc/pki/tls/private/totpcgi-ca.cert"; - }; -}; diff --git a/files/2fa/pam_url.conf.vpn.fedoraproject.org b/files/2fa/pam_url.conf.vpn.fedoraproject.org deleted file mode 100644 index 6e102e12f7..0000000000 --- a/files/2fa/pam_url.conf.vpn.fedoraproject.org +++ /dev/null @@ -1,21 +0,0 @@ -pam_url: -{ - settings: - { - url = "https://fas-all.vpn.fedoraproject.org:8443/"; # URI to fetch - returncode = "OK"; # The remote script/cgi should return a 200 http code and this string as its only results - userfield = "user"; # userfield name to send - passwdfield = "token"; # passwdfield name to send - extradata = "&do=login"; # extradata to send - prompt = "Password+Token: "; # password prompt - }; - - ssl: - { - verify_peer = true; # Should we verify SSL ? - verify_host = true; # Should we verify the CN in the SSL cert? - client_cert = "/etc/pki/tls/private/totpcgi.pem"; # file to use as client-side certificate - client_key = "/etc/pki/tls/private/totpcgi.pem"; # file to use as client-side key (can be same file as above if a single cert) - ca_cert = "/etc/pki/tls/private/totpcgi-ca.cert"; - }; -}; diff --git a/files/2fa/sudo.pam b/files/2fa/sudo.pam deleted file mode 100644 index 9912cdef59..0000000000 --- a/files/2fa/sudo.pam +++ /dev/null @@ -1,9 +0,0 @@ -#%PAM-1.0 -auth required pam_env.so -auth sufficient pam_url.so config=/etc/pam_url.conf -auth requisite pam_succeed_if.so uid >= 500 quiet -auth required pam_deny.so -account include system-auth -password include system-auth -session optional pam_keyinit.so revoke -session required pam_limits.so diff --git a/files/2fa/sudo.pam.dev.fedoraproject.org b/files/2fa/sudo.pam.dev.fedoraproject.org deleted file mode 100644 index 030bb26463..0000000000 --- a/files/2fa/sudo.pam.dev.fedoraproject.org +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -password include system-auth -session optional pam_keyinit.so revoke -session required pam_limits.so diff --git a/files/common/fedora-modular.repo b/files/common/fedora-modular.repo index cacbc82abd..7f69a45281 100644 --- a/files/common/fedora-modular.repo +++ b/files/common/fedora-modular.repo @@ -1,6 +1,5 @@ [fedora-modular] name=Fedora Modular $releasever - $basearch -failovermethod=priority {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int ) %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/releases/$releasever/Modular/$basearch/os/ {% else %} @@ -14,7 +13,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [fedora-modular-debuginfo] name=Fedora Modular $releasever - $basearch - Debug -failovermethod=priority {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int ) %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/releases/$releasever/Modular/$basearch/debug/tree/ {% else %} @@ -28,7 +26,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [fedora-modular-source] name=Fedora Modular $releasever - Source -failovermethod=priority {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int ) %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/releases/$releasever/Modular/source/tree/ {% else %} diff --git a/files/common/fedora-modular.repo-secondary b/files/common/fedora-modular.repo-secondary index 84a9dfdcf6..2005b24471 100644 --- a/files/common/fedora-modular.repo-secondary +++ b/files/common/fedora-modular.repo-secondary @@ -1,6 +1,5 @@ [fedora-modular] name=Fedora Modular $releasever - $basearch -failovermethod=priority {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int ) %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/releases/$releasever/Modular/$basearch/os/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch @@ -14,7 +13,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [fedora-modular-debuginfo] name=Fedora Modular $releasever - $basearch - Debug -failovermethod=priority {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int ) %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/releases/$releasever/Modular/$basearch/debug/tree/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch @@ -28,7 +26,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [fedora-modular-source] name=Fedora Modular $releasever - Source -failovermethod=priority {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int ) %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/releases/$releasever/Modular/source/tree/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch diff --git a/files/common/fedora-updates-modular.repo b/files/common/fedora-updates-modular.repo index e6633268f9..58d114804e 100644 --- a/files/common/fedora-updates-modular.repo +++ b/files/common/fedora-updates-modular.repo @@ -1,6 +1,5 @@ [updates-modular] name=Fedora Modular $releasever - $basearch - Updates -failovermethod=priority baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Modular/$basearch/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch enabled=1 @@ -9,7 +8,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-modular-debuginfo] name=Fedora Modular $releasever - $basearch - Updates - Debug -failovermethod=priority baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Modular/$basearch/debug/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-debug-f$releasever&arch=$basearch enabled=0 @@ -18,7 +16,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-modular-source] name=Fedora Modular $releasever - Updates Source -failovermethod=priority baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Modular/SRPMS/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-source-f$releasever&arch=$basearch enabled=0 diff --git a/files/common/fedora-updates-modular.repo-secondary b/files/common/fedora-updates-modular.repo-secondary index 1536696f38..52ad5962d6 100644 --- a/files/common/fedora-updates-modular.repo-secondary +++ b/files/common/fedora-updates-modular.repo-secondary @@ -1,6 +1,5 @@ [updates-modular] name=Fedora Modular $releasever - $basearch - Updates -failovermethod=priority {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int ) %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/$releasever/Modular/$basearch/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch @@ -13,7 +12,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-modular-debuginfo] name=Fedora Modular $releasever - $basearch - Updates - Debug -failovermethod=priority {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int ) %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/$releasever/Modular/$basearch/debug/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-debug-f$releasever&arch=$basearch @@ -26,7 +24,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-modular-source] name=Fedora Modular $releasever - Updates Source -failovermethod=priority {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int ) %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/$releasever/Modular/SRPMS/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-source-f$releasever&arch=$basearch diff --git a/files/common/fedora-updates-testing-modular.repo b/files/common/fedora-updates-testing-modular.repo index 2047e50451..7b01cac09f 100644 --- a/files/common/fedora-updates-testing-modular.repo +++ b/files/common/fedora-updates-testing-modular.repo @@ -1,6 +1,5 @@ [updates-testing-modular] name=Fedora Modular $releasever - $basearch - Test Updates -failovermethod=priority baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/testing/$releasever/Modular/$basearch/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-f$releasever&arch=$basearch enabled=0 @@ -9,7 +8,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-testing-modular-debuginfo] name=Fedora Modular $releasever - $basearch - Test Updates Debug -failovermethod=priority baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Modular/$basearch/debug/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-debug-f$releasever&arch=$basearch enabled=0 @@ -18,7 +16,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-testing-modular-source] name=Fedora Modular $releasever - Test Updates Source -failovermethod=priority baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Modular/SRPMS/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-source-f$releasever&arch=$basearch enabled=0 diff --git a/files/common/fedora-updates-testing-modular.repo-secondary b/files/common/fedora-updates-testing-modular.repo-secondary index 0b05a4cf73..245ec471ce 100644 --- a/files/common/fedora-updates-testing-modular.repo-secondary +++ b/files/common/fedora-updates-testing-modular.repo-secondary @@ -1,6 +1,5 @@ [updates-testing-modular] name=Fedora Modular $releasever - $basearch - Test Updates -failovermethod=priority baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/testing/$releasever/Modular/$basearch/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-f$releasever&arch=$basearch enabled=0 @@ -9,7 +8,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-testing-modular-debuginfo] name=Fedora Modular $releasever - $basearch - Test Updates Debug -failovermethod=priority baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/$releasever/Modular/$basearch/debug/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-debug-f$releasever&arch=$basearch enabled=0 @@ -18,7 +16,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-testing-modular-source] name=Fedora Modular $releasever - Test Updates Source -failovermethod=priority baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/$releasever/Modular/SRPMS/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-source-f$releasever&arch=$basearch enabled=0 diff --git a/files/common/fedora-updates-testing.repo b/files/common/fedora-updates-testing.repo index 52f807b444..05e87ff1e3 100644 --- a/files/common/fedora-updates-testing.repo +++ b/files/common/fedora-updates-testing.repo @@ -1,6 +1,5 @@ [updates-testing] name=Fedora $releasever - $basearch - Test Updates -failovermethod=priority {% if ansible_distribution_major_version|int >27 %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/testing/$releasever/Everything/$basearch/ {% else %} @@ -13,7 +12,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-testing-debuginfo] name=Fedora $releasever - $basearch - Test Updates Debug -failovermethod=priority {% if ansible_distribution_major_version|int >27 %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/testing/$releasever/Everything/$basearch/debug/ {% else %} @@ -26,7 +24,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-testing-source] name=Fedora $releasever - Test Updates Source -failovermethod=priority {% if ansible_distribution_major_version|int >27 %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/testing/$releasever/Everything/SRPMS/ {% else %} diff --git a/files/common/fedora-updates-testing.repo-secondary b/files/common/fedora-updates-testing.repo-secondary index 734a342fc1..c2c47a87b3 100644 --- a/files/common/fedora-updates-testing.repo-secondary +++ b/files/common/fedora-updates-testing.repo-secondary @@ -1,6 +1,5 @@ [updates-testing] name=Fedora $releasever - $basearch - Test Updates -failovermethod=priority {% if ansible_distribution_major_version|int >27 %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/testing/$releasever/Everything/$basearch/ {% else %} @@ -13,7 +12,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-testing-debuginfo] name=Fedora $releasever - $basearch - Test Updates Debug -failovermethod=priority {% if ansible_distribution_major_version|int >27 %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/testing/$releasever/Everything/$basearch/debug/ {% else %} @@ -26,7 +24,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-testing-source] name=Fedora $releasever - Test Updates Source -failovermethod=priority {% if ansible_distribution_major_version|int >27 %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/testing/$releasever/Everything/SRPMS/ {% else %} diff --git a/files/common/fedora-updates.repo b/files/common/fedora-updates.repo index f01ae60fb7..04851e12c0 100644 --- a/files/common/fedora-updates.repo +++ b/files/common/fedora-updates.repo @@ -1,6 +1,5 @@ [updates] name=Fedora $releasever - $basearch - Updates -failovermethod=priority {% if ansible_distribution_major_version|int > 27 %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Everything/$basearch/ {% else %} @@ -13,7 +12,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-debuginfo] name=Fedora $releasever - $basearch - Updates - Debug -failovermethod=priority {% if ansible_distribution_major_version|int > 27 %} baseurl=http://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Everything/$basearch/debug/ {% else %} @@ -26,7 +24,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-source] name=Fedora $releasever - Updates Source -failovermethod=priority {% if ansible_distribution_major_version|int > 27 %} baseurl=http://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/updates/$releasever/Everything/SRPMS/ {% else %} diff --git a/files/common/fedora-updates.repo-secondary b/files/common/fedora-updates.repo-secondary index f65f951d24..c3475c21e7 100644 --- a/files/common/fedora-updates.repo-secondary +++ b/files/common/fedora-updates.repo-secondary @@ -1,6 +1,5 @@ [updates] name=Fedora $releasever - $basearch - Updates -failovermethod=priority {% if ansible_distribution_major_version|int >27 %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/$releasever/Everything/$basearch/ {% else %} @@ -13,7 +12,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-debuginfo] name=Fedora $releasever - $basearch - Updates - Debug -failovermethod=priority {% if ansible_distribution_major_version|int >27 %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/$releasever/Everything/$basearch/debug/ {% else %} @@ -26,7 +24,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [updates-source] name=Fedora $releasever - Updates Source -failovermethod=priority {% if ansible_distribution_major_version|int >27 %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/updates/$releasever/SRPMS/ {% else %} diff --git a/files/common/fedora.repo b/files/common/fedora.repo index b8dcf7662e..794ade7733 100644 --- a/files/common/fedora.repo +++ b/files/common/fedora.repo @@ -1,6 +1,5 @@ [fedora] name=Fedora $releasever - $basearch -failovermethod=priority {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int ) %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/releases/$releasever/Everything/$basearch/os/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch @@ -14,7 +13,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [fedora-debuginfo] name=Fedora $releasever - $basearch - Debug -failovermethod=priority {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int ) %} baseurl=http://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch @@ -28,7 +26,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [fedora-source] name=Fedora $releasever - Source -failovermethod=priority {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched|int is defined else FedoraRawhideNumber|int ) %} baseurl=http://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora/linux/releases/$releasever/Everything/source/tree/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch diff --git a/files/common/fedora.repo-secondary b/files/common/fedora.repo-secondary index d67ea25654..29cd964a78 100644 --- a/files/common/fedora.repo-secondary +++ b/files/common/fedora.repo-secondary @@ -1,6 +1,5 @@ [fedora] name=Fedora $releasever - $basearch -failovermethod=priority {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int ) %} baseurl=https://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/releases/$releasever/Everything/$basearch/os/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch @@ -14,7 +13,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [fedora-debuginfo] name=Fedora $releasever - $basearch - Debug -failovermethod=priority {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int ) %} baseurl=http://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/releases/$releasever/Everything/$basearch/debug/tree/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch @@ -28,7 +26,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch [fedora-source] name=Fedora $releasever - Source -failovermethod=priority {% if ansible_distribution_major_version|int < ( FedoraBranchedNumber|int if FedoraBranched == True else FedoraRawhideNumber|int ) %} baseurl=http://infrastructure.fedoraproject.org/pub{{ archive_if_archived }}/fedora-secondary/releases/$releasever/Everything/source/tree/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch diff --git a/inventory/group_vars/batcave b/inventory/group_vars/batcave index 1ab5d1e947..b9eeb7e6f7 100644 --- a/inventory/group_vars/batcave +++ b/inventory/group_vars/batcave @@ -33,6 +33,7 @@ ipa_client_shell_groups: - sysadmin-odcs - sysadmin-osbs - sysadmin-qa +- sysadmin-retrace - sysadmin-releasemonitoring - sysadmin-releng - sysadmin-tools diff --git a/inventory/group_vars/bugzilla2fedmsg b/inventory/group_vars/bugzilla2fedmsg deleted file mode 100644 index f9e30a3726..0000000000 --- a/inventory/group_vars/bugzilla2fedmsg +++ /dev/null @@ -1,62 +0,0 @@ ---- -lvm_size: 20000 -mem_size: 6144 -num_cpus: 2 -freezes: false - -# for systems that do not match the above - specify the same parameter in -# the host_vars/$hostname file - -tcp_ports: [ 3000, 3001, 3002, 3003 ] - -primary_auth_source: ipa -ipa_host_group: bugzilla2fedmsg -ipa_host_group_desc: Service to bridge Bugzilla events into fedmsg -ipa_client_shell_groups: -- sysadmin-datanommer -- sysadmin-noc -- sysadmin-veteran -ipa_client_sudo_groups: -- sysadmin-datanommer - -# These are consumed by a task in roles/fedmsg/base/main.yml -fedmsg_certs: -- service: shell - owner: root - group: sysadmin - can_send: - - logger.log -- service: bugzilla2fedmsg - owner: root - group: fedmsg - can_send: - - bugzilla.bug.new - - bugzilla.bug.update - -# for fedora-messaging -username: "bugzilla2fedmsg{{ env_suffix }}" - -# For the MOTD -csi_security_category: Low -csi_primary_contact: Fedmsg admins - sysadmin-datanommer-members@fedoraproject.org -csi_purpose: Run the bugzilla2fedmsg bridge to forward RH messages onto fedmsg -csi_relationship: | - A 'moksha-hub' daemon is the only thing really running here. (Don't confuse - that with the 'fedmsg-hub' running on most of our other backend machines.) - - The bugzilla2fedmsg package provides a plugin to the moksha-hub that - connects out over the STOMP protocol to a 'fabric' of JBOSS FUSE brokers - living in the Red Hat DMZ. We authenticate with a cert/key pair that is - kept in /etc/pki/fedmsg/. Those brokers should push bugzilla events over - STOMP to our moksha-hub daemon. When a message arrives, we query bugzilla - about the change to get some 'more interesting' data to stuff in our - payload, then we sign the message using a fedmsg cert and fire it off to the - rest of our bus. - - This service has no database, no memcached usage. It depends on those STOMP - brokers and being able to query bugzilla.rh.com. - - STOMP config: /etc/moksha/production.ini - fedmsg config: /etc/fedmsg.d/ - certs: /etc/pki/fedmsg - code: /usr/lib/python2.7/site-packages/bugzilla2fedmsg.py diff --git a/inventory/group_vars/bugzilla2fedmsg_stg b/inventory/group_vars/bugzilla2fedmsg_stg deleted file mode 100644 index e89dc52db1..0000000000 --- a/inventory/group_vars/bugzilla2fedmsg_stg +++ /dev/null @@ -1,61 +0,0 @@ ---- -# Define resources for this group of hosts here. -lvm_size: 20000 -mem_size: 4096 -num_cpus: 1 - -# for systems that do not match the above - specify the same parameter in -# the host_vars/$hostname file - -tcp_ports: [ 3000, 3001 ] - -ipa_host_group: bugzilla2fedmsg -ipa_host_group_desc: Service to bridge Bugzilla events into fedmsg -ipa_client_shell_groups: -- sysadmin-datanommer -- sysadmin-noc -- sysadmin-veteran -ipa_client_sudo_groups: -- sysadmin-datanommer - -# These are consumed by a task in roles/fedmsg/base/main.yml -fedmsg_certs: -- service: shell - owner: root - group: sysadmin - can_send: - - logger.log -- service: bugzilla2fedmsg - owner: root - group: fedmsg - can_send: - - bugzilla.bug.new - - bugzilla.bug.update - -# for fedora-messaging -username: "bugzilla2fedmsg{{ env_suffix }}" - -# For the MOTD -csi_security_category: Low -csi_primary_contact: Fedmsg admins - sysadmin-datanommer-members@fedoraproject.org -csi_purpose: Run the bugzilla2fedmsg bridge to forward RH messages onto fedmsg -csi_relationship: | - A 'moksha-hub' daemon is the only thing really running here. (Don't confuse - that with the 'fedmsg-hub' running on most of our other backend machines.) - - The bugzilla2fedmsg package provides a plugin to the moksha-hub that - connects out over the STOMP protocol to a 'fabric' of JBOSS FUSE brokers - living in the Red Hat DMZ. We authenticate with a cert/key pair that is - kept in /etc/pki/fedmsg/. Those brokers should push bugzilla events over - STOMP to our moksha-hub daemon. When a message arrives, we query bugzilla - about the change to get some 'more interesting' data to stuff in our - payload, then we sign the message using a fedmsg cert and fire it off to the - rest of our bus. - - This service has no database, no memcached usage. It depends on those STOMP - brokers and being able to query bugzilla.rh.com. - - STOMP config: /etc/moksha/production.ini - fedmsg config: /etc/fedmsg.d/ - certs: /etc/pki/fedmsg - code: /usr/lib/python2.7/site-packages/bugzilla2fedmsg.py diff --git a/inventory/group_vars/buildvm b/inventory/group_vars/buildvm index b4e82667e0..969df66260 100644 --- a/inventory/group_vars/buildvm +++ b/inventory/group_vars/buildvm @@ -6,7 +6,7 @@ mem_size: 15360 max_mem_size: "{{ mem_size }}" num_cpus: 6 ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora -ks_repo: http://10.3.163.35/pub/fedora/linux/releases/33/Server/x86_64/os/ +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/34/Server/x86_64/os/ nm: 255.255.255.0 gw: 10.5.125.254 dns: 10.3.163.33 diff --git a/inventory/group_vars/buildvm_aarch64 b/inventory/group_vars/buildvm_aarch64 index 8f0eb42d72..544a19d9b7 100644 --- a/inventory/group_vars/buildvm_aarch64 +++ b/inventory/group_vars/buildvm_aarch64 @@ -6,8 +6,8 @@ mem_size: 40960 max_mem_size: "{{ mem_size }}" num_cpus: 5 max_cpu: "{{ num_cpus }}" -ks_url: http://10.3.163.35/repo/rhel/ks/buildvm-fedora-33 -ks_repo: http://10.3.163.35/pub/fedora/linux/releases/33/Server/aarch64/os/ +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/34/Server/aarch64/os/ nm: 255.255.255.0 gw: 10.3.170.254 dns: 10.3.163.33 diff --git a/inventory/group_vars/buildvm_aarch64_stg b/inventory/group_vars/buildvm_aarch64_stg index 301297296c..af39a5baf3 100644 --- a/inventory/group_vars/buildvm_aarch64_stg +++ b/inventory/group_vars/buildvm_aarch64_stg @@ -6,8 +6,8 @@ mem_size: 40960 max_mem_size: "{{ mem_size }}" num_cpus: 5 max_cpu: "{{ num_cpus }}" -ks_url: http://10.3.163.35/repo/rhel/ks/buildvm-fedora-33 -ks_repo: http://10.3.163.35/pub/fedora/linux/releases/33/Server/aarch64/os/ +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/34/Server/aarch64/os/ nm: 255.255.255.0 gw: 10.3.167.254 dns: 10.3.163.33 diff --git a/inventory/group_vars/buildvm_armv7 b/inventory/group_vars/buildvm_armv7 index 9f37d5af43..4400a5e72e 100644 --- a/inventory/group_vars/buildvm_armv7 +++ b/inventory/group_vars/buildvm_armv7 @@ -2,12 +2,12 @@ # common items for the buildvm-aarmv7* koji builders volgroup: /dev/vg_guests lvm_size: 140000 -mem_size: 24576 +mem_size: 40960 max_mem_size: "{{ mem_size }}" num_cpus: 5 max_cpu: "{{ num_cpus }}" -ks_url: http://10.3.163.35/repo/rhel/ks/buildvm-fedora-32-armv7-iad2 -ks_repo: http://10.3.163.35/pub/fedora/linux/releases/32/Server/armhfp/os/ +ks_url: http://10.3.163.35/repo/rhel/ks/buildvm-fedora-34-armv7 +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/34/Server/armhfp/os/ nm: 255.255.255.0 gw: 10.3.170.254 dns: 10.3.163.33 diff --git a/inventory/group_vars/buildvm_armv7_stg b/inventory/group_vars/buildvm_armv7_stg index c86a9dcc96..2999c07f00 100644 --- a/inventory/group_vars/buildvm_armv7_stg +++ b/inventory/group_vars/buildvm_armv7_stg @@ -7,7 +7,7 @@ max_mem_size: "{{ mem_size }}" num_cpus: 5 max_cpu: "{{ num_cpus }}" ks_url: http://10.3.163.35/repo/rhel/ks/buildvm-fedora-34-armv7 -ks_repo: http://10.3.163.35/pub/fedora/linux/development/34/Server/armhfp/os/ +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/34/Server/armhfp/os/ nm: 255.255.255.0 gw: 10.3.167.254 dns: 10.3.163.33 diff --git a/inventory/group_vars/buildvm_ppc64le b/inventory/group_vars/buildvm_ppc64le index fd15d5bce9..5d3c83cc5d 100644 --- a/inventory/group_vars/buildvm_ppc64le +++ b/inventory/group_vars/buildvm_ppc64le @@ -6,7 +6,7 @@ mem_size: 20480 max_mem_size: 20480 num_cpus: 8 -ks_repo: http://10.3.163.35/pub/fedora-secondary/releases/33/Server/ppc64le/os/ +ks_repo: http://10.3.163.35/pub/fedora-secondary/releases/34/Server/ppc64le/os/ ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora ipa_server: ipa01.iad2.fedoraproject.org diff --git a/inventory/group_vars/buildvm_ppc64le_stg b/inventory/group_vars/buildvm_ppc64le_stg index 355bfa0119..4481476520 100644 --- a/inventory/group_vars/buildvm_ppc64le_stg +++ b/inventory/group_vars/buildvm_ppc64le_stg @@ -5,8 +5,8 @@ lvm_size: 150000 mem_size: 10240 max_mem_size: "{{ mem_size }}" num_cpus: 4 -ks_url: http://10.3.163.35/repo/rhel/ks/buildvm-fedora-33 -ks_repo: http://10.3.163.35/pub/fedora-secondary/releases/33/Server/ppc64le/os/ +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora +ks_repo: http://10.3.163.35/pub/fedora-secondary/releases/34/Server/ppc64le/os/ nm: 255.255.255.0 gw: 10.3.167.254 dns: 10.3.163.33 diff --git a/inventory/group_vars/buildvm_s390x b/inventory/group_vars/buildvm_s390x index d5a828dc73..cd7df89cf8 100644 --- a/inventory/group_vars/buildvm_s390x +++ b/inventory/group_vars/buildvm_s390x @@ -8,8 +8,8 @@ vmhost: buildvmhost-s390x-01.s390.fedoraproject.org gw: 10.16.0.254 main_bridge: vmbr volgroup: /dev/fedora_linux_lpar_1 -ks_url: http://10.3.163.35/repo/rhel/ks/buildvm-fedora-31-s390x -ks_repo: http://10.3.163.35/pub/fedora-secondary/releases/31/Server/s390x/os/ +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora +ks_repo: http://10.3.163.35/pub/fedora-secondary/releases/34/Server/s390x/os/ dns: 10.3.163.33 nm: 255.255.255.0 virt_install_command: "{{ virt_install_command_s390x_one_nic_unsafe }}" diff --git a/inventory/group_vars/buildvm_s390x_stg b/inventory/group_vars/buildvm_s390x_stg index d32fae34c1..c516817bba 100644 --- a/inventory/group_vars/buildvm_s390x_stg +++ b/inventory/group_vars/buildvm_s390x_stg @@ -2,8 +2,8 @@ ansible_ifcfg_blocklist: True createrepo: False host_group: kojibuilder -ks_url: http://10.3.163.35/repo/rhel/ks/buildvm-fedora-32-s390x -ks_repo: http://10.3.163.35/pub/fedora-secondary/releases/32/Server/s390x/os/ +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora +ks_repo: http://10.3.163.35/pub/fedora-secondary/releases/34/Server/s390x/os/ virt_install_command: "{{ virt_install_command_s390x_one_nic_unsafe }}" koji_hub_nfs: "fedora_koji" diff --git a/inventory/group_vars/buildvm_stg b/inventory/group_vars/buildvm_stg index 6bba7e8feb..931189c589 100644 --- a/inventory/group_vars/buildvm_stg +++ b/inventory/group_vars/buildvm_stg @@ -8,8 +8,8 @@ num_cpus: 4 dns: 10.3.163.33 gw: 10.3.167.254 nm: 255.255.255.0 -ks_repo: http://10.3.163.35/pub/fedora/linux/releases/33/Server/x86_64/os/ -ks_url: http://10.3.163.35/repo/rhel/ks/buildvm-fedora-33 +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/34/Server/x86_64/os/ +ks_url: http://10.3.163.35/repo/rhel/ks/kvm_fedora resolvconf: "resolv.conf/iad2" virt_install_command: "{{ virt_install_command_one_nic_unsafe }}" ipa_server: ipa01.stg.iad2.fedoraproject.org diff --git a/inventory/group_vars/copr_aws b/inventory/group_vars/copr_aws index fed831617c..66c66b2346 100644 --- a/inventory/group_vars/copr_aws +++ b/inventory/group_vars/copr_aws @@ -28,8 +28,22 @@ nm_controlled_resolv: True builders: # max|max_spawn|max_prealloc aws: - x86_64: [100,15,15] - armhfp: [20,3,3] - aarch64: [20,6,6] + x86_64: [30, 5, 5] + aarch64: [8, 2, 2] + aws_spot: + x86_64: [60, 10, 20] + aarch64: [30, 4, 6] + + x86_hypervisor_01: + x86_64: [20, 4, 20] + + x86_hypervisor_02: + x86_64: [20, 4, 20] + + x86_hypervisor_03: + x86_64: [20, 4, 20] + + #x86_hypervisor_04: + # x86_64: [20, 4, 20] rpm_vendor_copr_name: Fedora Copr diff --git a/inventory/group_vars/copr_back_aws b/inventory/group_vars/copr_back_aws index 9e3151c9f0..d67b6a7d92 100644 --- a/inventory/group_vars/copr_back_aws +++ b/inventory/group_vars/copr_back_aws @@ -16,9 +16,11 @@ copr_builder_images: x86_64: copr-builder-x86_64-f32-20200914_072608 ppc64le: copr-builder-ppc64le-f31-20200117_132023 aarch64: copr-builder-aarch64-f32-20200914_073754 + hypervisor: + x86_64: copr-builder-20210511_210127 aws: - x86_64: ami-05655b44ed8d4f869 # copr-builder-x86_64-f33-20210119_150254 - aarch64: ami-0e26990bd41c19eba # copr-builder-aarch64-f33-20210119_145252 + x86_64: ami-05766cb7551777d09 # copr-builder-x86_64-f34-20210516_142224 + aarch64: ami-0b7d49fecf0c393a9 # copr-builder-aarch64-f34-20210516_143216 nrpe_procs_warn: 2200 nrpe_procs_crit: 2500 diff --git a/inventory/group_vars/copr_back_dev_aws b/inventory/group_vars/copr_back_dev_aws index 05945f8d25..229130fc5c 100644 --- a/inventory/group_vars/copr_back_dev_aws +++ b/inventory/group_vars/copr_back_dev_aws @@ -19,8 +19,8 @@ copr_builder_images: hypervisor: x86_64: copr-builder-20210511_210127 aws: - x86_64: ami-05655b44ed8d4f869 # copr-builder-x86_64-f33-20210119_150254 - aarch64: ami-0e26990bd41c19eba # copr-builder-aarch64-f33-20210119_145252 + x86_64: ami-05766cb7551777d09 # copr-builder-x86_64-f34-20210516_142224 + aarch64: ami-0b7d49fecf0c393a9 # copr-builder-aarch64-f34-20210516_143216 do_sign: "true" diff --git a/inventory/group_vars/copr_dev_aws b/inventory/group_vars/copr_dev_aws index bc512328d7..f69e7b664b 100644 --- a/inventory/group_vars/copr_dev_aws +++ b/inventory/group_vars/copr_dev_aws @@ -29,8 +29,23 @@ nm_controlled_resolv: True builders: # max|max_spawn|max_prealloc aws: - x86_64: [20,5,5] - armhfp: [3,1,1] - aarch64: [5,2,2] + x86_64: [4, 1, 1] + aarch64: [2, 1, 1] + + aws_spot: + x86_64: [5, 2, 3] + aarch64: [5, 2, 2] + + x86_hypervisor_01: + x86_64: [2,1,1] + + x86_hypervisor_02: + x86_64: [2, 1, 1] + + x86_hypervisor_03: + x86_64: [2, 1, 1] + + #x86_hypervisor_04: + # x86_64: [2, 1, 1] rpm_vendor_copr_name: Fedora Copr (devel) diff --git a/inventory/group_vars/fedora_nightlies b/inventory/group_vars/fedora_nightlies index c5139845f6..ad3592a777 100644 --- a/inventory/group_vars/fedora_nightlies +++ b/inventory/group_vars/fedora_nightlies @@ -10,6 +10,7 @@ fedora_nightlies_amqp_cert: /etc/pki/fedora-messaging/openqa-cert.pem fedora_nightlies_amqp_queue: "openqa_fedora_nightlies" fedora_nightlies_amqp_routing_keys: ["org.fedoraproject.prod.openqa.job.done", "org.fedoraproject.prod.pungi.compose.status.change"] fedora_nightlies_amqp_html_file: /usr/share/openqa/public/nightlies.html +fedora_nightlies_amqp_data_file: /usr/share/openqa/public/nightlies.json # fedora-messaging email error reporting settings fedora_nightlies_amqp_mailto: ["adamwill@fedoraproject.org"] diff --git a/inventory/group_vars/nagios b/inventory/group_vars/nagios index e41c280054..b3423e1500 100644 --- a/inventory/group_vars/nagios +++ b/inventory/group_vars/nagios @@ -44,7 +44,8 @@ csi_purpose: Monitoring system # iad2_management_hosts: - backup01.mgmt.iad2.fedoraproject.org - - bkernel-x86-01.mgmt.iad2.fedoraproject.org + - bkernel01.mgmt.iad2.fedoraproject.org + - bkernel02.mgmt.iad2.fedoraproject.org - bvmhost-x86-01.mgmt.iad2.fedoraproject.org - bvmhost-x86-02.mgmt.iad2.fedoraproject.org - bvmhost-x86-03.mgmt.iad2.fedoraproject.org diff --git a/inventory/group_vars/openqa_lab_workers b/inventory/group_vars/openqa_lab_workers index 23bf6a88ae..d92c1e1876 100644 --- a/inventory/group_vars/openqa_lab_workers +++ b/inventory/group_vars/openqa_lab_workers @@ -19,9 +19,6 @@ openqa_repo: updates-testing # we are all NFS workers for now at least openqa_nfs_worker: true -# 2021-05 git bump -openqa_scratch: ["67449532"] - deployment_type: stg freezes: false diff --git a/inventory/group_vars/openqa_workers b/inventory/group_vars/openqa_workers index e2d2a48671..5ec254a2a2 100644 --- a/inventory/group_vars/openqa_workers +++ b/inventory/group_vars/openqa_workers @@ -12,10 +12,6 @@ openqa_env_suffix: openqa_env_prefix: openqa_env: production -# 2020-11: we're deploying prod from u-t ATM because I don't -# want to wait a week to push stable -openqa_repo: updates-testing - # we are all NFS workers for now at least openqa_nfs_worker: true diff --git a/inventory/group_vars/retrace b/inventory/group_vars/retrace index 0801ea3e69..8f8e854e1d 100644 --- a/inventory/group_vars/retrace +++ b/inventory/group_vars/retrace @@ -1,4 +1,6 @@ --- +env: production + primary_auth_source: ipa ipa_host_group: retrace ipa_host_group_desc: Retrace servers @@ -14,15 +16,14 @@ ansible_ifcfg_blocklist: true tcp_ports: [ 80, 443 ] -custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.78.11 --dport 2049 -j ACCEPT', - '-A INPUT -p tcp -m tcp -s 10.5.78.11 --dport 5432 -j ACCEPT' ] +custom_rules: +- '-A INPUT -p tcp -m tcp -s 10.5.78.11 --dport 2049 -j ACCEPT' +- '-A INPUT -p tcp -m tcp -s 10.5.78.11 --dport 5432 -j ACCEPT' nrpe_procs_warn: 1800 nrpe_procs_crit: 2000 -devel: false - # Since retrace is on the qa network, it needs to actively connect to our # inbound relay. fedmsg_active: True diff --git a/inventory/group_vars/retrace_stg_aws b/inventory/group_vars/retrace_stg_aws index 517c696e9f..92290aacf7 100644 --- a/inventory/group_vars/retrace_stg_aws +++ b/inventory/group_vars/retrace_stg_aws @@ -1,15 +1,9 @@ --- -ipa_host_group: retrace -ipa_host_group_desc: Retrace servers -ipa_client_shell_groups: -- retrace -ipa_client_sudo_groups: -- retrace -devel: true +env: staging vpn: true -tcp_ports: [22, 80, 443 ] +tcp_ports: [ 22, 80, 443 ] sudoers: "{{ private }}/files/sudo/arm-retrace-sudoers" root_auth_users: msuchy mfabik mgrabovs mzidek diff --git a/inventory/group_vars/staging b/inventory/group_vars/staging index a9d71a72ba..3ba09af1f0 100644 --- a/inventory/group_vars/staging +++ b/inventory/group_vars/staging @@ -28,3 +28,5 @@ ipa_realm: STG.FEDORAPROJECT.ORG ipa_admin_password: "{{ ipa_stg_admin_password }}" # RIP, FAS primary_auth_source: ipa +ipa_server_nodes: + - ipa01.stg.iad2.fedoraproject.org diff --git a/inventory/host_vars/blockerbugs01.iad2.fedoraproject.org b/inventory/host_vars/blockerbugs01.iad2.fedoraproject.org index ebe61448f7..4a6035ef9e 100644 --- a/inventory/host_vars/blockerbugs01.iad2.fedoraproject.org +++ b/inventory/host_vars/blockerbugs01.iad2.fedoraproject.org @@ -2,8 +2,10 @@ nm: 255.255.255.0 gw: 10.3.163.254 dns: 10.3.163.33 -ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora-32-iad2 -ks_repo: http://10.3.163.35/pub/fedora/linux/releases/32/Server/x86_64/os/ + +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/33/Server/x86_64/os/ + volgroup: /dev/vg_guests eth0_ip: 10.3.163.88 vmhost: vmhost-x86-07.iad2.fedoraproject.org diff --git a/inventory/host_vars/bugzilla2fedmsg01.iad2.fedoraproject.org b/inventory/host_vars/bugzilla2fedmsg01.iad2.fedoraproject.org deleted file mode 100644 index bed814879e..0000000000 --- a/inventory/host_vars/bugzilla2fedmsg01.iad2.fedoraproject.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.3.163.254 -dns: 10.3.163.33 - -ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-7-iad2 -ks_repo: http://10.3.163.35/repo/rhel/RHEL7-x86_64/ - -eth0_ip: 10.3.163.45 - -volgroup: /dev/vg_guests -vmhost: vmhost-x86-05.iad2.fedoraproject.org - -datacenter: iad2 diff --git a/inventory/host_vars/bugzilla2fedmsg01.stg.iad2.fedoraproject.org b/inventory/host_vars/bugzilla2fedmsg01.stg.iad2.fedoraproject.org deleted file mode 100644 index 99aa3c4805..0000000000 --- a/inventory/host_vars/bugzilla2fedmsg01.stg.iad2.fedoraproject.org +++ /dev/null @@ -1,13 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.3.166.254 -dns: 10.3.163.33 - -volgroup: /dev/vg_guests -vmhost: vmhost-x86-04.stg.iad2.fedoraproject.org -datacenter: iad2 - -ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-7-iad2 -ks_repo: http://10.3.163.35/repo/rhel/RHEL7-x86_64/ - -eth0_ip: 10.3.166.45 diff --git a/inventory/host_vars/buildvm-a32-01.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-01.iad2.fedoraproject.org index f9212de133..341d204034 100644 --- a/inventory/host_vars/buildvm-a32-01.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-01.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.61 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:0d:2c:f0 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no \ No newline at end of file +eth0_ip: 10.3.170.61 diff --git a/inventory/host_vars/buildvm-a32-01.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-01.stg.iad2.fedoraproject.org index 1bfa15bdec..7ceea79b92 100644 --- a/inventory/host_vars/buildvm-a32-01.stg.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-01.stg.iad2.fedoraproject.org @@ -5,30 +5,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes eth0_ip: 10.3.167.46 -eth0_ipv4: 10.3.167.46 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.167.254 - -has_ipv6: no - -mac0: 52:54:00:d4:6a:ca - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no diff --git a/inventory/host_vars/buildvm-a32-02.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-02.iad2.fedoraproject.org index f9ee260ce6..7092480c8d 100644 --- a/inventory/host_vars/buildvm-a32-02.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-02.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.62 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:ac:8e:53 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.62 diff --git a/inventory/host_vars/buildvm-a32-02.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-02.stg.iad2.fedoraproject.org index ddb7216f2b..e3078ca887 100644 --- a/inventory/host_vars/buildvm-a32-02.stg.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-02.stg.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.167.54 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.167.254 - -has_ipv6: no - -mac0: 52:54:00:ac:8e:53 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.167.54 diff --git a/inventory/host_vars/buildvm-a32-03.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-03.iad2.fedoraproject.org index 1be4cf49eb..52913e6fbe 100644 --- a/inventory/host_vars/buildvm-a32-03.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-03.iad2.fedoraproject.org @@ -4,30 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.63 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:ec:a5:81 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no - +eth0_ip: 10.3.170.63 diff --git a/inventory/host_vars/buildvm-a32-04.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-04.iad2.fedoraproject.org index b87aa71f7a..08dff18700 100644 --- a/inventory/host_vars/buildvm-a32-04.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-04.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.64 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:5c:f6:d2 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.64 diff --git a/inventory/host_vars/buildvm-a32-05.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-05.iad2.fedoraproject.org index 7df0f8ba13..0498937e6e 100644 --- a/inventory/host_vars/buildvm-a32-05.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-05.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.65 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:d7:98:00 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.65 diff --git a/inventory/host_vars/buildvm-a32-06.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-06.iad2.fedoraproject.org index 76f0b7fc66..289b87b8e3 100644 --- a/inventory/host_vars/buildvm-a32-06.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-06.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.66 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:de:fc:9e - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no \ No newline at end of file +eth0_ip: 10.3.170.66 diff --git a/inventory/host_vars/buildvm-a32-07.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-07.iad2.fedoraproject.org index 0697cbc702..0ab0672e59 100644 --- a/inventory/host_vars/buildvm-a32-07.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-07.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.67 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:5d:9e:16 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.67 diff --git a/inventory/host_vars/buildvm-a32-08.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-08.iad2.fedoraproject.org index 501e7d4aff..e74e900309 100644 --- a/inventory/host_vars/buildvm-a32-08.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-08.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.68 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:08:bd:f4 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.68 diff --git a/inventory/host_vars/buildvm-a32-09.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-09.iad2.fedoraproject.org index d65faaa028..6fd38a0d1c 100644 --- a/inventory/host_vars/buildvm-a32-09.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-09.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.69 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:e5:6a:68 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no \ No newline at end of file +eth0_ip: 10.3.170.69 diff --git a/inventory/host_vars/buildvm-a32-10.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-10.iad2.fedoraproject.org index 26e9c33fd3..3b9903ecda 100644 --- a/inventory/host_vars/buildvm-a32-10.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-10.iad2.fedoraproject.org @@ -4,30 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.70 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:e7:6f:ed - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no - +eth0_ip: 10.3.170.70 diff --git a/inventory/host_vars/buildvm-a32-11.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-11.iad2.fedoraproject.org index 31a9c7c993..840854e470 100644 --- a/inventory/host_vars/buildvm-a32-11.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-11.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.71 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:18:90:20 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.71 diff --git a/inventory/host_vars/buildvm-a32-12.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-12.iad2.fedoraproject.org index b9da517c4a..7486f20a1e 100644 --- a/inventory/host_vars/buildvm-a32-12.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-12.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.72 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:23:d9:c7 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.72 diff --git a/inventory/host_vars/buildvm-a32-13.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-13.iad2.fedoraproject.org index da0331eb6a..c1b0e5b16f 100644 --- a/inventory/host_vars/buildvm-a32-13.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-13.iad2.fedoraproject.org @@ -4,30 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.73 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:67:17:ea - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no - +eth0_ip: 10.3.170.73 diff --git a/inventory/host_vars/buildvm-a32-14.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-14.iad2.fedoraproject.org index 8788cc97e2..fdec200cf4 100644 --- a/inventory/host_vars/buildvm-a32-14.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-14.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.74 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:28:be:1a - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.74 diff --git a/inventory/host_vars/buildvm-a32-15.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-15.iad2.fedoraproject.org index 4200843bbf..88368a9f88 100644 --- a/inventory/host_vars/buildvm-a32-15.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-15.iad2.fedoraproject.org @@ -4,30 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.75 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:52:1c:61 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no - +eth0_ip: 10.3.170.75 diff --git a/inventory/host_vars/buildvm-a32-16.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-16.iad2.fedoraproject.org index c6faf52930..7a3c363a28 100644 --- a/inventory/host_vars/buildvm-a32-16.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-16.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.76 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:34:95:28 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.76 diff --git a/inventory/host_vars/buildvm-a32-17.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-17.iad2.fedoraproject.org index e04ddf21af..5cee861ab7 100644 --- a/inventory/host_vars/buildvm-a32-17.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-17.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.77 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:6c:d2:9d - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no \ No newline at end of file +eth0_ip: 10.3.170.77 diff --git a/inventory/host_vars/buildvm-a32-18.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-18.iad2.fedoraproject.org index a6cff9fd8d..887adb0f8f 100644 --- a/inventory/host_vars/buildvm-a32-18.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-18.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.78 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:f9:13:e4 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.78 diff --git a/inventory/host_vars/buildvm-a32-19.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-19.iad2.fedoraproject.org index d1694b7cfa..a6310b8fa6 100644 --- a/inventory/host_vars/buildvm-a32-19.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-19.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.79 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:2d:53:c8 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.79 diff --git a/inventory/host_vars/buildvm-a32-20.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-20.iad2.fedoraproject.org index 712f7f22cc..0c0a175ca8 100644 --- a/inventory/host_vars/buildvm-a32-20.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-20.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.80 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:b6:5e:eb - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.80 diff --git a/inventory/host_vars/buildvm-a32-21.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-21.iad2.fedoraproject.org index 5e0ce3df0d..7414236714 100644 --- a/inventory/host_vars/buildvm-a32-21.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-21.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.81 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:67:c4:5b - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.81 diff --git a/inventory/host_vars/buildvm-a32-22.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-22.iad2.fedoraproject.org index 289eb4b114..fee6cb88d8 100644 --- a/inventory/host_vars/buildvm-a32-22.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-22.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.82 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:77:e0:9d - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.82 diff --git a/inventory/host_vars/buildvm-a32-23.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-23.iad2.fedoraproject.org index b79250e23d..b88f116220 100644 --- a/inventory/host_vars/buildvm-a32-23.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-23.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.83 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:59:40:a8 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.83 diff --git a/inventory/host_vars/buildvm-a32-24.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-24.iad2.fedoraproject.org index 5f90985a91..7edac7c452 100644 --- a/inventory/host_vars/buildvm-a32-24.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-24.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.84 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:d3:91:61 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.84 diff --git a/inventory/host_vars/buildvm-a32-25.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-25.iad2.fedoraproject.org index 3deaff5385..7bc5a4507a 100644 --- a/inventory/host_vars/buildvm-a32-25.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-25.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.85 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:fa:fc:dd - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.85 diff --git a/inventory/host_vars/buildvm-a32-26.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-26.iad2.fedoraproject.org index d3d73836c3..919a666e04 100644 --- a/inventory/host_vars/buildvm-a32-26.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-26.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.86 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:43:98:b2 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.86 diff --git a/inventory/host_vars/buildvm-a32-27.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-27.iad2.fedoraproject.org index 452634db78..a5173a1988 100644 --- a/inventory/host_vars/buildvm-a32-27.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-27.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.87 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:ef:19:17 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.87 diff --git a/inventory/host_vars/buildvm-a32-31.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-31.iad2.fedoraproject.org index 5f6fb96068..07469a25fd 100644 --- a/inventory/host_vars/buildvm-a32-31.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-31.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.144 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:9e:67:92 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.144 diff --git a/inventory/host_vars/buildvm-a32-32.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-32.iad2.fedoraproject.org index ab4a900705..2c777a9546 100644 --- a/inventory/host_vars/buildvm-a32-32.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-32.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.145 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:48:3e:a3 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.145 diff --git a/inventory/host_vars/buildvm-a32-33.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-33.iad2.fedoraproject.org index 6e3bd10d77..dca4648728 100644 --- a/inventory/host_vars/buildvm-a32-33.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a32-33.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.146 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:ec:06:17 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.146 diff --git a/inventory/host_vars/buildvm-a64-01.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-01.iad2.fedoraproject.org index 2ea1cb5f3c..0538df2eae 100644 --- a/inventory/host_vars/buildvm-a64-01.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-01.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.91 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:a0:23:2f - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no \ No newline at end of file +eth0_ip: 10.3.170.91 diff --git a/inventory/host_vars/buildvm-a64-01.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-01.stg.iad2.fedoraproject.org index bfa23f414b..6d2eb03485 100644 --- a/inventory/host_vars/buildvm-a64-01.stg.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-01.stg.iad2.fedoraproject.org @@ -4,30 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.167.45 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.167.254 - -has_ipv6: no - -mac0: 52:54:00:2f:20:0d - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no - +eth0_ip: 10.3.167.45 diff --git a/inventory/host_vars/buildvm-a64-02.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-02.iad2.fedoraproject.org index db0229d16f..72bd09ebf6 100644 --- a/inventory/host_vars/buildvm-a64-02.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-02.iad2.fedoraproject.org @@ -4,30 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.92 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:81:4c:e8 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no - +eth0_ip: 10.3.170.92 diff --git a/inventory/host_vars/buildvm-a64-02.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-02.stg.iad2.fedoraproject.org index 66b9531c3d..e8cccc155a 100644 --- a/inventory/host_vars/buildvm-a64-02.stg.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-02.stg.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.167.52 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.167.254 - -has_ipv6: no - -mac0: 52:54:00:2b:1d:73 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.167.52 diff --git a/inventory/host_vars/buildvm-a64-03.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-03.iad2.fedoraproject.org index f1c49279e6..a5ca82678a 100644 --- a/inventory/host_vars/buildvm-a64-03.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-03.iad2.fedoraproject.org @@ -4,30 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.93 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:9c:4e:9d - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no - +eth0_ip: 10.3.170.93 diff --git a/inventory/host_vars/buildvm-a64-04.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-04.iad2.fedoraproject.org index 1543aa072b..b868bc953d 100644 --- a/inventory/host_vars/buildvm-a64-04.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-04.iad2.fedoraproject.org @@ -4,30 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.94 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:4f:50:9f - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no - +eth0_ip: 10.3.170.94 diff --git a/inventory/host_vars/buildvm-a64-05.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-05.iad2.fedoraproject.org index b140cfd6ee..d676d3ac8f 100644 --- a/inventory/host_vars/buildvm-a64-05.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-05.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.95 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:d8:ce:90 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.95 diff --git a/inventory/host_vars/buildvm-a64-06.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-06.iad2.fedoraproject.org index 750514f995..ffafaad4fd 100644 --- a/inventory/host_vars/buildvm-a64-06.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-06.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.96 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:56:00:ac - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.96 diff --git a/inventory/host_vars/buildvm-a64-07.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-07.iad2.fedoraproject.org index 2f674e23dc..6e82d5de81 100644 --- a/inventory/host_vars/buildvm-a64-07.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-07.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.97 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:3d:74:dc - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.97 diff --git a/inventory/host_vars/buildvm-a64-08.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-08.iad2.fedoraproject.org index 800a3905c9..2d3120c696 100644 --- a/inventory/host_vars/buildvm-a64-08.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-08.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.98 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:20:d4:4b - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no \ No newline at end of file +eth0_ip: 10.3.170.98 diff --git a/inventory/host_vars/buildvm-a64-09.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-09.iad2.fedoraproject.org index 241b3f1613..3dd1edf897 100644 --- a/inventory/host_vars/buildvm-a64-09.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-09.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.99 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:c8:74:89 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.99 diff --git a/inventory/host_vars/buildvm-a64-10.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-10.iad2.fedoraproject.org index 092fa3a9dd..5921e5967b 100644 --- a/inventory/host_vars/buildvm-a64-10.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-10.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.100 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:fa:fe:fd - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.100 diff --git a/inventory/host_vars/buildvm-a64-11.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-11.iad2.fedoraproject.org index ab18f657f9..5b606fe8ab 100644 --- a/inventory/host_vars/buildvm-a64-11.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-11.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.101 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:79:6d:b9 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.101 diff --git a/inventory/host_vars/buildvm-a64-12.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-12.iad2.fedoraproject.org index bd6da942e4..f8723bd0ad 100644 --- a/inventory/host_vars/buildvm-a64-12.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-12.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.102 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:54:7f:f2 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.102 diff --git a/inventory/host_vars/buildvm-a64-13.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-13.iad2.fedoraproject.org index 1551ffff7b..f37342eff1 100644 --- a/inventory/host_vars/buildvm-a64-13.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-13.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.103 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:6c:e5:84 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.103 diff --git a/inventory/host_vars/buildvm-a64-14.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-14.iad2.fedoraproject.org index b4465eebee..6b38e3c8df 100644 --- a/inventory/host_vars/buildvm-a64-14.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-14.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.104 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:70:9d:8d - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.104 diff --git a/inventory/host_vars/buildvm-a64-15.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-15.iad2.fedoraproject.org index 3134fca3d9..4a7649cfe9 100644 --- a/inventory/host_vars/buildvm-a64-15.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-15.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.105 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:e4:02:9f - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.105 diff --git a/inventory/host_vars/buildvm-a64-16.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-16.iad2.fedoraproject.org index 41c61660c5..abe22bf19d 100644 --- a/inventory/host_vars/buildvm-a64-16.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-16.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.106 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:92:3b:d3 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.106 diff --git a/inventory/host_vars/buildvm-a64-17.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-17.iad2.fedoraproject.org index b0bea3bf38..4b4c7cfb56 100644 --- a/inventory/host_vars/buildvm-a64-17.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-17.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.107 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:26:84:9e - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.107 diff --git a/inventory/host_vars/buildvm-a64-18.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-18.iad2.fedoraproject.org index cee6b0c2aa..f15ed90599 100644 --- a/inventory/host_vars/buildvm-a64-18.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-18.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.108 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:14:25:7b - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.108 diff --git a/inventory/host_vars/buildvm-a64-19.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-19.iad2.fedoraproject.org index 4f08cceb44..4893581ebb 100644 --- a/inventory/host_vars/buildvm-a64-19.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-19.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.109 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:fa:b9:23 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.109 diff --git a/inventory/host_vars/buildvm-a64-20.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-20.iad2.fedoraproject.org index 7a963ba8cb..d16213a823 100644 --- a/inventory/host_vars/buildvm-a64-20.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-20.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.110 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:7e:9a:f1 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.110 diff --git a/inventory/host_vars/buildvm-a64-21.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-21.iad2.fedoraproject.org index 3ad27312e3..6b430ce0dd 100644 --- a/inventory/host_vars/buildvm-a64-21.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-21.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.111 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:f9:49:c1 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.111 diff --git a/inventory/host_vars/buildvm-a64-22.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-22.iad2.fedoraproject.org index 5cec67bb18..dcd1d471f0 100644 --- a/inventory/host_vars/buildvm-a64-22.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-22.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.112 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:cf:2b:93 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.112 diff --git a/inventory/host_vars/buildvm-a64-23.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-23.iad2.fedoraproject.org index ac94546764..36c8987065 100644 --- a/inventory/host_vars/buildvm-a64-23.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-23.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.113 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:4f:f7:ce - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.113 diff --git a/inventory/host_vars/buildvm-a64-24.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-24.iad2.fedoraproject.org index 9d5daa07ca..30558fcd36 100644 --- a/inventory/host_vars/buildvm-a64-24.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-24.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.114 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:2f:4a:5c - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.114 diff --git a/inventory/host_vars/buildvm-a64-25.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-25.iad2.fedoraproject.org index 08f1cfa704..7827a23848 100644 --- a/inventory/host_vars/buildvm-a64-25.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-25.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.115 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:50:46:92 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no \ No newline at end of file +eth0_ip: 10.3.170.115 diff --git a/inventory/host_vars/buildvm-a64-26.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-26.iad2.fedoraproject.org index 52a5af81c2..d8e151b048 100644 --- a/inventory/host_vars/buildvm-a64-26.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-26.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.116 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:49:22:db - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no \ No newline at end of file +eth0_ip: 10.3.170.116 diff --git a/inventory/host_vars/buildvm-a64-27.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-27.iad2.fedoraproject.org index 72d56203b5..f6286f8742 100644 --- a/inventory/host_vars/buildvm-a64-27.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-27.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.117 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:10:15:cf - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no \ No newline at end of file +eth0_ip: 10.3.170.117 diff --git a/inventory/host_vars/buildvm-a64-31.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-31.iad2.fedoraproject.org index f1b81928c8..e0ff0fa77e 100644 --- a/inventory/host_vars/buildvm-a64-31.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-31.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.141 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:cd:15:88 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.141 diff --git a/inventory/host_vars/buildvm-a64-32.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-32.iad2.fedoraproject.org index 7ea20d4b96..dbeee1cd3c 100644 --- a/inventory/host_vars/buildvm-a64-32.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-32.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.142 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:91:82:01 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.142 diff --git a/inventory/host_vars/buildvm-a64-33.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-33.iad2.fedoraproject.org index f0c8f4c023..d138a9ca3a 100644 --- a/inventory/host_vars/buildvm-a64-33.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-a64-33.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.170.143 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.170.254 - -has_ipv6: no - -mac0: 52:54:00:37:5c:1d - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.170.143 diff --git a/inventory/host_vars/buildvm-ppc64le-01.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-01.iad2.fedoraproject.org index 135119462a..6a2b7c587c 100644 --- a/inventory/host_vars/buildvm-ppc64le-01.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-01.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.41 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:c6:c6:96 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.41 diff --git a/inventory/host_vars/buildvm-ppc64le-01.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-01.stg.iad2.fedoraproject.org index cb04900db5..a5658d7bc0 100644 --- a/inventory/host_vars/buildvm-ppc64le-01.stg.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-01.stg.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.167.47 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.167.254 - -has_ipv6: no - -mac0: 52:54:00:c3:5f:9a - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.167.47 diff --git a/inventory/host_vars/buildvm-ppc64le-02.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-02.iad2.fedoraproject.org index 2bf7421691..078a01e063 100644 --- a/inventory/host_vars/buildvm-ppc64le-02.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-02.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.42 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:50:6e:ae - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.42 diff --git a/inventory/host_vars/buildvm-ppc64le-02.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-02.stg.iad2.fedoraproject.org index df8b4713ab..68ad40daf3 100644 --- a/inventory/host_vars/buildvm-ppc64le-02.stg.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-02.stg.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.167.48 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.167.254 - -has_ipv6: no - -mac0: 52:54:00:a4:8b:ae - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.167.48 diff --git a/inventory/host_vars/buildvm-ppc64le-03.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-03.iad2.fedoraproject.org index 26e684f26c..460073c4cc 100644 --- a/inventory/host_vars/buildvm-ppc64le-03.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-03.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.43 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:69:cc:10 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.43 diff --git a/inventory/host_vars/buildvm-ppc64le-03.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-03.stg.iad2.fedoraproject.org index a580adde10..6b3edca54f 100644 --- a/inventory/host_vars/buildvm-ppc64le-03.stg.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-03.stg.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.167.49 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.167.254 - -has_ipv6: no - -mac0: 52:54:00:ee:06:14 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.167.49 diff --git a/inventory/host_vars/buildvm-ppc64le-04.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-04.iad2.fedoraproject.org index 463fc0a5c2..8e05e8c0ec 100644 --- a/inventory/host_vars/buildvm-ppc64le-04.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-04.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.44 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:72:a2:96 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.44 diff --git a/inventory/host_vars/buildvm-ppc64le-04.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-04.stg.iad2.fedoraproject.org index 09d9060fc2..d339a91278 100644 --- a/inventory/host_vars/buildvm-ppc64le-04.stg.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-04.stg.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.167.50 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.167.254 - -has_ipv6: no - -mac0: 52:54:00:de:dc:59 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.167.50 diff --git a/inventory/host_vars/buildvm-ppc64le-05.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-05.iad2.fedoraproject.org index 505b56d205..ea108c0b49 100644 --- a/inventory/host_vars/buildvm-ppc64le-05.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-05.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.45 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:cf:85:9d - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.45 diff --git a/inventory/host_vars/buildvm-ppc64le-05.stg.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-05.stg.iad2.fedoraproject.org index b17747314b..1b113a95b4 100644 --- a/inventory/host_vars/buildvm-ppc64le-05.stg.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-05.stg.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.167.51 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.167.254 - -has_ipv6: no - -mac0: 52:54:00:e9:f3:a0 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.167.51 diff --git a/inventory/host_vars/buildvm-ppc64le-06.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-06.iad2.fedoraproject.org index cbd01ca881..a3c3982681 100644 --- a/inventory/host_vars/buildvm-ppc64le-06.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-06.iad2.fedoraproject.org @@ -4,30 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.46 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:e6:6e:da - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no - +eth0_ip: 10.3.171.46 diff --git a/inventory/host_vars/buildvm-ppc64le-07.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-07.iad2.fedoraproject.org index 107244a5b9..bf2b5982a9 100644 --- a/inventory/host_vars/buildvm-ppc64le-07.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-07.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.47 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:66:cd:a5 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.47 diff --git a/inventory/host_vars/buildvm-ppc64le-08.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-08.iad2.fedoraproject.org index 53c07af4be..e72b067367 100644 --- a/inventory/host_vars/buildvm-ppc64le-08.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-08.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.48 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:c7:ee:cd - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.48 diff --git a/inventory/host_vars/buildvm-ppc64le-09.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-09.iad2.fedoraproject.org index b2ad69d32e..f227cd6cfe 100644 --- a/inventory/host_vars/buildvm-ppc64le-09.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-09.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.49 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:73:93:25 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.49 diff --git a/inventory/host_vars/buildvm-ppc64le-10.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-10.iad2.fedoraproject.org index 7bc1f32faf..c94ea9923b 100644 --- a/inventory/host_vars/buildvm-ppc64le-10.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-10.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.50 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:7d:68:b8 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.50 diff --git a/inventory/host_vars/buildvm-ppc64le-11.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-11.iad2.fedoraproject.org index 33620b0012..0092023dd2 100644 --- a/inventory/host_vars/buildvm-ppc64le-11.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-11.iad2.fedoraproject.org @@ -4,30 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.51 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:35:7b:11 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no - +eth0_ip: 10.3.171.51 diff --git a/inventory/host_vars/buildvm-ppc64le-12.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-12.iad2.fedoraproject.org index ce1bd5c697..d46d969ab1 100644 --- a/inventory/host_vars/buildvm-ppc64le-12.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-12.iad2.fedoraproject.org @@ -4,30 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.52 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:95:93:97 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no - +eth0_ip: 10.3.171.52 diff --git a/inventory/host_vars/buildvm-ppc64le-13.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-13.iad2.fedoraproject.org index 15761e1974..c3f6d494a2 100644 --- a/inventory/host_vars/buildvm-ppc64le-13.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-13.iad2.fedoraproject.org @@ -4,30 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes eth0_ip: 10.3.171.53 -eth0_ipv4: 10.3.171.53 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:36:bc:34 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no diff --git a/inventory/host_vars/buildvm-ppc64le-14.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-14.iad2.fedoraproject.org index b235cf18b9..b004583010 100644 --- a/inventory/host_vars/buildvm-ppc64le-14.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-14.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.54 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:9c:b6:cd - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.54 diff --git a/inventory/host_vars/buildvm-ppc64le-15.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-15.iad2.fedoraproject.org index b59ccf6b8e..9e01631945 100644 --- a/inventory/host_vars/buildvm-ppc64le-15.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-15.iad2.fedoraproject.org @@ -4,30 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes eth0_ip: 10.3.171.55 -eth0_ipv4: 10.3.171.55 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:68:64:dc - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no diff --git a/inventory/host_vars/buildvm-ppc64le-16.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-16.iad2.fedoraproject.org index a2dca31382..c1585fa5cd 100644 --- a/inventory/host_vars/buildvm-ppc64le-16.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-16.iad2.fedoraproject.org @@ -4,30 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes eth0_ip: 10.3.171.56 -eth0_ipv4: 10.3.171.56 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:cb:57:ef - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no diff --git a/inventory/host_vars/buildvm-ppc64le-17.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-17.iad2.fedoraproject.org index 70720cf05f..eb29d2045d 100644 --- a/inventory/host_vars/buildvm-ppc64le-17.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-17.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.57 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:24:c8:21 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.57 diff --git a/inventory/host_vars/buildvm-ppc64le-18.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-18.iad2.fedoraproject.org index 9b229cfef6..c01389b777 100644 --- a/inventory/host_vars/buildvm-ppc64le-18.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-18.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.58 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:07:95:b8 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.58 diff --git a/inventory/host_vars/buildvm-ppc64le-19.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-19.iad2.fedoraproject.org index 70c95da01a..2626225675 100644 --- a/inventory/host_vars/buildvm-ppc64le-19.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-19.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.59 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:4a:bc:c6 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.59 diff --git a/inventory/host_vars/buildvm-ppc64le-20.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-20.iad2.fedoraproject.org index 49d21f2727..4d7a3f3910 100644 --- a/inventory/host_vars/buildvm-ppc64le-20.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-20.iad2.fedoraproject.org @@ -4,30 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes eth0_ip: 10.3.171.60 -eth0_ipv4: 10.3.171.60 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:e0:0f:d5 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no diff --git a/inventory/host_vars/buildvm-ppc64le-21.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-21.iad2.fedoraproject.org index fd3eab9171..a66a619309 100644 --- a/inventory/host_vars/buildvm-ppc64le-21.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-21.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.61 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:53:00:ba - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.61 diff --git a/inventory/host_vars/buildvm-ppc64le-22.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-22.iad2.fedoraproject.org index c0a4accc27..72a1550ebe 100644 --- a/inventory/host_vars/buildvm-ppc64le-22.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-22.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.62 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:c9:a8:47 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.62 diff --git a/inventory/host_vars/buildvm-ppc64le-23.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-23.iad2.fedoraproject.org index 329fe141fc..60aafdcf64 100644 --- a/inventory/host_vars/buildvm-ppc64le-23.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-23.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.63 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:fa:c2:62 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.63 diff --git a/inventory/host_vars/buildvm-ppc64le-24.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-24.iad2.fedoraproject.org index 6481ae788b..158ad3f056 100644 --- a/inventory/host_vars/buildvm-ppc64le-24.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-24.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.64 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:c4:f9:e5 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.64 diff --git a/inventory/host_vars/buildvm-ppc64le-25.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-25.iad2.fedoraproject.org index 8df138f839..0bbabc8002 100644 --- a/inventory/host_vars/buildvm-ppc64le-25.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-25.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.65 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:d9:62:a4 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.65 diff --git a/inventory/host_vars/buildvm-ppc64le-26.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-26.iad2.fedoraproject.org index 5e8f88a4b3..e4d33ab5da 100644 --- a/inventory/host_vars/buildvm-ppc64le-26.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-26.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.66 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:e0:41:0a - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.66 diff --git a/inventory/host_vars/buildvm-ppc64le-27.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-27.iad2.fedoraproject.org index 4a691b36e8..30caf62d10 100644 --- a/inventory/host_vars/buildvm-ppc64le-27.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-27.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.67 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:5e:ae:96 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.67 diff --git a/inventory/host_vars/buildvm-ppc64le-28.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-28.iad2.fedoraproject.org index 946f0082ed..3a8a329029 100644 --- a/inventory/host_vars/buildvm-ppc64le-28.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-28.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.68 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:ed:23:78 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.68 diff --git a/inventory/host_vars/buildvm-ppc64le-29.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-29.iad2.fedoraproject.org index 8cd9041623..42c8c2f441 100644 --- a/inventory/host_vars/buildvm-ppc64le-29.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-29.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.69 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:ee:13:14 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.69 diff --git a/inventory/host_vars/buildvm-ppc64le-30.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-30.iad2.fedoraproject.org index 548e6dc44c..3b9a05ef82 100644 --- a/inventory/host_vars/buildvm-ppc64le-30.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-30.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.70 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:c2:2c:d2 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.70 diff --git a/inventory/host_vars/buildvm-ppc64le-31.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-31.iad2.fedoraproject.org index e1fe439110..476d83c057 100644 --- a/inventory/host_vars/buildvm-ppc64le-31.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-31.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.71 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:f3:f9:4b - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.71 diff --git a/inventory/host_vars/buildvm-ppc64le-32.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-32.iad2.fedoraproject.org index a1d508932e..6c6eb6bb27 100644 --- a/inventory/host_vars/buildvm-ppc64le-32.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-32.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.72 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:24:96:9d - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.72 diff --git a/inventory/host_vars/buildvm-ppc64le-33.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-33.iad2.fedoraproject.org index efd970e288..b740c8afe5 100644 --- a/inventory/host_vars/buildvm-ppc64le-33.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-33.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.73 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:50:e1:63 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.73 diff --git a/inventory/host_vars/buildvm-ppc64le-34.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-34.iad2.fedoraproject.org index 954f5becad..ff55b23a5f 100644 --- a/inventory/host_vars/buildvm-ppc64le-34.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-34.iad2.fedoraproject.org @@ -4,30 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes eth0_ip: 10.3.171.74 -eth0_ipv4: 10.3.171.74 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:b8:ba:ec - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no diff --git a/inventory/host_vars/buildvm-ppc64le-35.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-35.iad2.fedoraproject.org index 7c58f13d19..d41f796aab 100644 --- a/inventory/host_vars/buildvm-ppc64le-35.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-35.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.75 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:1c:10:6a - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.75 diff --git a/inventory/host_vars/buildvm-ppc64le-36.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-36.iad2.fedoraproject.org index 0ce809a2d3..2f4d18a29e 100644 --- a/inventory/host_vars/buildvm-ppc64le-36.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-36.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.76 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:09:41:c0 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.76 diff --git a/inventory/host_vars/buildvm-ppc64le-37.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-37.iad2.fedoraproject.org index 5c63038ec1..ab688c4a7b 100644 --- a/inventory/host_vars/buildvm-ppc64le-37.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-37.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.77 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:da:4c:c7 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.77 diff --git a/inventory/host_vars/buildvm-ppc64le-38.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-38.iad2.fedoraproject.org index 245f63f717..8500559f4f 100644 --- a/inventory/host_vars/buildvm-ppc64le-38.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-38.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.78 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:b4:0c:06 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.78 diff --git a/inventory/host_vars/buildvm-ppc64le-39.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-39.iad2.fedoraproject.org index 917d33effd..a48dea53ee 100644 --- a/inventory/host_vars/buildvm-ppc64le-39.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-39.iad2.fedoraproject.org @@ -4,30 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.79 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:79:59:53 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no - +eth0_ip: 10.3.171.79 diff --git a/inventory/host_vars/buildvm-ppc64le-40.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-40.iad2.fedoraproject.org index e4bcf174f6..01de5481b6 100644 --- a/inventory/host_vars/buildvm-ppc64le-40.iad2.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-40.iad2.fedoraproject.org @@ -4,29 +4,4 @@ datacenter: iad2 dns1: 10.3.163.33 dns2: 10.3.163.34 -has_ipv4: yes -eth0_ipv4: 10.3.171.80 -eth0_ipv4_nm: 24 -eth0_ipv4_gw: 10.3.171.254 - -has_ipv6: no - -mac0: 52:54:00:a2:03:d8 - -network_connections: -- name: eth0 - mac: "{{ mac0 }}" - state: up - type: ethernet - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - gateway4: "{{ eth0_ipv4_gw }}" - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - dns_search: - - iad2.fedoraproject.org - - fedoraproject.org - dhcp4: no - auto6: no +eth0_ip: 10.3.171.80 diff --git a/inventory/host_vars/cloud-noc-os01.rdu-cc.fedoraproject.org b/inventory/host_vars/cloud-noc-os01.rdu-cc.fedoraproject.org index f542a2c73d..033326dd32 100644 --- a/inventory/host_vars/cloud-noc-os01.rdu-cc.fedoraproject.org +++ b/inventory/host_vars/cloud-noc-os01.rdu-cc.fedoraproject.org @@ -20,9 +20,12 @@ eth0_ipv4_nm: 23 eth0_ipv4_gw: 8.43.85.254 eth1_ipv4: 172.23.1.3 eth1_ipv4_nm: 24 +eth2_ipv4: 172.23.5.3 +eth2_ipv4_nm: 24 mac0: 52:54:00:46:ed:ba mac1: 52:54:00:24:8e:bc +mac2: 52:54:00:d6:ab:66 public_hostname: cloud-noc-os01.rdu-cc.fedoraproject.org network_connections: @@ -51,6 +54,15 @@ network_connections: - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}" dhcp4: no auto6: no + - name: eth2 + mac: "{{ mac2 }}" + type: ethernet + autoconnect: yes + ip: + address: + - "{{ eth2_ipv4 }}/{{ eth2_ipv4_nm }}" + dhcp4: no + auto6: no virt_install_command: virt-install -n {{ inventory_hostname }} --memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio diff --git a/inventory/host_vars/ipsilon01.iad2.fedoraproject.org b/inventory/host_vars/ipsilon01.iad2.fedoraproject.org index 889f1a105f..f8853fc74b 100644 --- a/inventory/host_vars/ipsilon01.iad2.fedoraproject.org +++ b/inventory/host_vars/ipsilon01.iad2.fedoraproject.org @@ -3,8 +3,8 @@ nm: 255.255.255.0 gw: 10.3.163.254 dns: 10.3.163.33 -ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora-32-iad2 -ks_repo: http://10.3.163.35/pub/fedora/linux/releases/32/Server/x86_64/os/ +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/34/Server/x86_64/os/ volgroup: /dev/vg_guests eth0_ip: 10.3.163.105 diff --git a/inventory/host_vars/ipsilon01.stg.iad2.fedoraproject.org b/inventory/host_vars/ipsilon01.stg.iad2.fedoraproject.org index 6c05e89a5d..12b5e14ce0 100644 --- a/inventory/host_vars/ipsilon01.stg.iad2.fedoraproject.org +++ b/inventory/host_vars/ipsilon01.stg.iad2.fedoraproject.org @@ -3,8 +3,8 @@ nm: 255.255.255.0 gw: 10.3.166.254 dns: 10.3.163.33 -ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora-32-iad2 -ks_repo: http://10.3.163.35/pub/fedora/linux/releases/32/Server/x86_64/os/ +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/34/Server/x86_64/os/ volgroup: /dev/vg_guests eth0_ip: 10.3.166.30 diff --git a/inventory/host_vars/ipsilon02.iad2.fedoraproject.org b/inventory/host_vars/ipsilon02.iad2.fedoraproject.org index 0b5eda282c..779645980d 100644 --- a/inventory/host_vars/ipsilon02.iad2.fedoraproject.org +++ b/inventory/host_vars/ipsilon02.iad2.fedoraproject.org @@ -3,8 +3,8 @@ nm: 255.255.255.0 gw: 10.3.163.254 dns: 10.3.163.33 -ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora-32-iad2 -ks_repo: http://10.3.163.35/pub/fedora/linux/releases/32/Server/x86_64/os/ +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/34/Server/x86_64/os/ volgroup: /dev/vg_guests eth0_ip: 10.3.163.106 diff --git a/inventory/host_vars/pagure01.fedoraproject.org b/inventory/host_vars/pagure01.fedoraproject.org deleted file mode 100644 index b94b6e8932..0000000000 --- a/inventory/host_vars/pagure01.fedoraproject.org +++ /dev/null @@ -1,38 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 8.43.85.254 -dns: 8.8.8.8 - -ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7-ext -ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ - -volgroup: /dev/vg_guests - -eth0_ip: 8.43.85.75 -eth0_nm: 255.255.255.0 -has_ipv6: yes -eth0_ipv6: "2620:52:3:1:dead:beef:cafe:fed5" -eth0_ipv6_gw: "2620:52:3:1:ffff:ffff:ffff:fffe" - -vmhost: virthost-cc-rdu02.fedoraproject.org -datacenter: rdu-cc - -# -# PostgreSQL configuration -# - -shared_buffers: "512MB" -effective_cache_size: 0 -temp_buffers: "8MB" -max_stack_depth: "4MB" - -ssh_hostnames: -- pagure.io - -# GDPR SAR variables - datanommer/datagrepper -sar_script: /usr/local/bin/pagure_sar.py -sar_script_user: git -sar_output_file: pagure.json - -# DB used: -pagure_db_host: 127.0.0.1 diff --git a/inventory/host_vars/retrace-stg.aws.fedoraproject.org b/inventory/host_vars/retrace-stg.aws.fedoraproject.org index b0a94ece73..1f5233bbc8 100644 --- a/inventory/host_vars/retrace-stg.aws.fedoraproject.org +++ b/inventory/host_vars/retrace-stg.aws.fedoraproject.org @@ -13,8 +13,8 @@ faf_server_name: retrace-stg.aws.fedoraproject.org/faf rs_use_faf_packages: true # we do not have enough storage on stg -rs_internal_fedora_vers: [32, rawhide] -rs_internal_fedora_vers_removed: [] +rs_internal_fedora_vers: [34, rawhide] +rs_internal_fedora_vers_removed: [31, 32, 33] rs_internal_arch_list: [source, x86_64, i386] # List of supported operating systems @@ -53,39 +53,42 @@ nagios_Check_Services: raid: false faf_repos: - - { name: 'fedora-32-source', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/32/Everything/source/tree/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/32/Everything/source/tree/'], - arch: 'src', - opsys: 'Fedora 32', - } - - { name: 'fedora-32-x86_64', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/32/Everything/x86_64/os/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/32/Everything/x86_64/os/'], - arch: 'x86_64', - opsys: 'Fedora 32', - } - - { name: 'fedora-32-x86_64-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/32/Everything/x86_64/debug/tree/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/32/Everything/x86_64/debug/tree/'], - arch: 'x86_64', - opsys: 'Fedora 32', - } - - { name: 'fedora-32-x86_64-testing-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/32/Everything/x86_64/debug/'], - arch: 'x86_64', - opsys: 'Fedora 32', - } - - { name: 'fedora-32-x86_64-testing', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/32/Everything/x86_64/'], - arch: 'x86_64', - opsys: 'Fedora 32', - } - - { name: 'fedora-32-x86_64-updates-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/32/Everything/x86_64/debug/'], - arch: 'x86_64', - opsys: 'Fedora 32', - } - - { name: 'fedora-32-x86_64-updates', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/32/Everything/x86_64/'], - arch: 'x86_64', - opsys: 'Fedora 32', - } + - name: 'fedora-34-source' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/source/tree/' + - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/34/Everything/source/tree/' + arch: 'src' + opsys: 'Fedora 34' + - name: 'fedora-34-x86_64' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/x86_64/os/' + - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/34/Everything/x86_64/os/' + arch: 'x86_64' + opsys: 'Fedora 34' + - name: 'fedora-34-x86_64-debug' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/x86_64/debug/tree/' + - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/34/Everything/x86_64/debug/tree/' + arch: 'x86_64' + opsys: 'Fedora 34' + - name: 'fedora-34-x86_64-testing-debug' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/34/Everything/x86_64/debug/' + arch: 'x86_64' + opsys: 'Fedora 34' + - name: 'fedora-34-x86_64-testing' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/34/Everything/x86_64/' + arch: 'x86_64' + opsys: 'Fedora 34' + - name: 'fedora-34-x86_64-updates-debug' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/34/Everything/x86_64/debug/' + arch: 'x86_64' + opsys: 'Fedora 34' + - name: 'fedora-34-x86_64-updates' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/34/Everything/x86_64/' + arch: 'x86_64' + opsys: 'Fedora 34' ... diff --git a/inventory/host_vars/retrace03.rdu-cc.fedoraproject.org b/inventory/host_vars/retrace03.rdu-cc.fedoraproject.org index edadeddd30..e6d8a81317 100644 --- a/inventory/host_vars/retrace03.rdu-cc.fedoraproject.org +++ b/inventory/host_vars/retrace03.rdu-cc.fedoraproject.org @@ -5,8 +5,8 @@ faf_server_name: retrace.fedoraproject.org/faf rs_use_faf_packages: true # we do not have enough storage on stg -rs_internal_fedora_vers: [32, 33, 34, rawhide] -rs_internal_fedora_vers_removed: [] +rs_internal_fedora_vers: [33, 34, rawhide] +rs_internal_fedora_vers_removed: [30, 31, 32] rs_internal_arch_list: [source, x86_64, i386] # consumed by roles/copr/certbot @@ -35,7 +35,9 @@ faf_opsys_list: # Clean-up packages of following EOLed operating systems eol_opsys: -# - { opsys: "Fedora", release: "30"} + - { opsys: "Fedora", release: "30"} + - { opsys: "Fedora", release: "31"} + - { opsys: "Fedora", release: "32"} # GDPR SAR variables sar_script: '/usr/bin/faf sar' @@ -43,110 +45,82 @@ sar_script_user: faf sar_output_file: faf.json faf_repos: - - { name: 'fedora-31-source', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/31/Everything/source/tree/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/31/Everything/source/tree/'], - arch: 'src', - opsys: 'Fedora 31', - } - - { name: 'fedora-31-x86_64', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/31/Everything/x86_64/os/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/31/Everything/x86_64/os/'], - arch: 'x86_64', - opsys: 'Fedora 31', - } - - { name: 'fedora-31-x86_64-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/31/Everything/x86_64/debug/tree/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/31/Everything/x86_64/debug/tree/'], - arch: 'x86_64', - opsys: 'Fedora 31', - } - - { name: 'fedora-31-x86_64-testing-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/31/Everything/x86_64/debug/'], - arch: 'x86_64', - opsys: 'Fedora 31', - } - - { name: 'fedora-31-x86_64-testing', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/31/Everything/x86_64/'], - arch: 'x86_64', - opsys: 'Fedora 31', - } - - { name: 'fedora-31-x86_64-updates-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/31/Everything/x86_64/debug/'], - arch: 'x86_64', - opsys: 'Fedora 31', - } - - { name: 'fedora-31-x86_64-updates', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/31/Everything/x86_64/'], - arch: 'x86_64', - opsys: 'Fedora 31', - } - - { name: 'fedora-32-source', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/32/Everything/source/tree/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/32/Everything/source/tree/'], - arch: 'src', - opsys: 'Fedora 32', - } - - { name: 'fedora-32-x86_64', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/32/Everything/x86_64/os/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/32/Everything/x86_64/os/'], - arch: 'x86_64', - opsys: 'Fedora 32', - } - - { name: 'fedora-32-x86_64-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/32/Everything/x86_64/debug/tree/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/32/Everything/x86_64/debug/tree/'], - arch: 'x86_64', - opsys: 'Fedora 32', - } - - { name: 'fedora-32-x86_64-testing-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/32/Everything/x86_64/debug/'], - arch: 'x86_64', - opsys: 'Fedora 32', - } - - { name: 'fedora-32-x86_64-testing', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/32/Everything/x86_64/'], - arch: 'x86_64', - opsys: 'Fedora 32', - } - - { name: 'fedora-32-x86_64-updates-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/32/Everything/x86_64/debug/'], - arch: 'x86_64', - opsys: 'Fedora 32', - } - - { name: 'fedora-32-x86_64-updates', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/32/Everything/x86_64/'], - arch: 'x86_64', - opsys: 'Fedora 32', - } -###### Fedora 33 - - { name: 'fedora-33-source', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/33/Everything/source/tree/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/33/Everything/source/tree/'], - arch: 'src', - opsys: 'Fedora 33', - } - - { name: 'fedora-33-x86_64', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/33/Everything/x86_64/os/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/33/Everything/x86_64/os/'], - arch: 'x86_64', - opsys: 'Fedora 33', - } - - { name: 'fedora-33-x86_64-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/33/Everything/x86_64/debug/tree/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/33/Everything/x86_64/debug/tree/'], - arch: 'x86_64', - opsys: 'Fedora 33', - } - - { name: 'fedora-33-x86_64-testing-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/33/Everything/x86_64/debug/'], - arch: 'x86_64', - opsys: 'Fedora 33', - } - - { name: 'fedora-33-x86_64-testing', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/33/Everything/x86_64/'], - arch: 'x86_64', - opsys: 'Fedora 33', - } - - { name: 'fedora-33-x86_64-updates-debug', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/33/Everything/x86_64/debug/'], - arch: 'x86_64', - opsys: 'Fedora 33', - } - - { name: 'fedora-33-x86_64-updates', - url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/33/Everything/x86_64/'], - arch: 'x86_64', - opsys: 'Fedora 33', - } - + # Fedora 33 repositories ------------------------------------------------ + - name: 'fedora-33-source' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/33/Everything/source/tree/' + - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/33/Everything/source/tree/' + arch: 'src' + opsys: 'Fedora 33' + - name: 'fedora-33-x86_64' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/33/Everything/x86_64/os/' + - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/33/Everything/x86_64/os/' + arch: 'x86_64' + opsys: 'Fedora 33' + - name: 'fedora-33-x86_64-debug' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/33/Everything/x86_64/debug/tree/' + - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/33/Everything/x86_64/debug/tree/' + arch: 'x86_64' + opsys: 'Fedora 33' + - name: 'fedora-33-x86_64-testing-debug' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/33/Everything/x86_64/debug/' + arch: 'x86_64' + opsys: 'Fedora 33' + - name: 'fedora-33-x86_64-testing' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/33/Everything/x86_64/' + arch: 'x86_64' + opsys: 'Fedora 33' + - name: 'fedora-33-x86_64-updates-debug' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/33/Everything/x86_64/debug/' + arch: 'x86_64' + opsys: 'Fedora 33' + - name: 'fedora-33-x86_64-updates' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/33/Everything/x86_64/' + arch: 'x86_64' + opsys: 'Fedora 33' + # Fedora 34 repositories ------------------------------------------------ + - name: 'fedora-34-source' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/source/tree/' + - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/34/Everything/source/tree/' + arch: 'src' + opsys: 'Fedora 34' + - name: 'fedora-34-x86_64' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/x86_64/os/' + - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/34/Everything/x86_64/os/' + arch: 'x86_64' + opsys: 'Fedora 34' + - name: 'fedora-34-x86_64-debug' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/x86_64/debug/tree/' + - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/34/Everything/x86_64/debug/tree/' + arch: 'x86_64' + opsys: 'Fedora 34' + - name: 'fedora-34-x86_64-testing-debug' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/34/Everything/x86_64/debug/' + arch: 'x86_64' + opsys: 'Fedora 34' + - name: 'fedora-34-x86_64-testing' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/34/Everything/x86_64/' + arch: 'x86_64' + opsys: 'Fedora 34' + - name: 'fedora-34-x86_64-updates-debug' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/34/Everything/x86_64/debug/' + arch: 'x86_64' + opsys: 'Fedora 34' + - name: 'fedora-34-x86_64-updates' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/34/Everything/x86_64/' + arch: 'x86_64' + opsys: 'Fedora 34' +... diff --git a/inventory/host_vars/value02.stg.iad2.fedoraproject.org b/inventory/host_vars/value02.stg.iad2.fedoraproject.org new file mode 100644 index 0000000000..287a1aadfa --- /dev/null +++ b/inventory/host_vars/value02.stg.iad2.fedoraproject.org @@ -0,0 +1,11 @@ +--- +nm: 255.255.255.0 +gw: 10.3.166.254 +dns: 10.3.163.33 +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-8-iad2 +ks_repo: http://10.3.163.35/repo/rhel/RHEL8-x86_64/ +volgroup: /dev/vg_guests +eth0_ip: 10.3.166.64 +eth0_nm: 255.255.255.0 +vmhost: vmhost-x86-06.stg.iad2.fedoraproject.org +datacenter: iad2 diff --git a/inventory/host_vars/wiki01.stg.iad2.fedoraproject.org b/inventory/host_vars/wiki01.stg.iad2.fedoraproject.org index 12473ab51f..789ea639b8 100644 --- a/inventory/host_vars/wiki01.stg.iad2.fedoraproject.org +++ b/inventory/host_vars/wiki01.stg.iad2.fedoraproject.org @@ -2,8 +2,8 @@ nm: 255.255.255.0 gw: 10.3.166.254 dns: 10.3.163.33 -ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora-32-iad2 -ks_repo: http://10.3.163.35/pub/fedora/linux/releases/32/Server/x86_64/os/ +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/34/Server/x86_64/os/ volgroup: /dev/vg_guests eth0_ip: 10.3.166.24 vmhost: vmhost-x86-07.stg.iad2.fedoraproject.org diff --git a/inventory/inventory b/inventory/inventory index 3c1e043fcb..2ba4865831 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -73,12 +73,6 @@ blockerbugs01.iad2.fedoraproject.org [blockerbugs_stg] blockerbugs01.stg.iad2.fedoraproject.org -[bugzilla2fedmsg] -bugzilla2fedmsg01.iad2.fedoraproject.org - -[bugzilla2fedmsg_stg] -bugzilla2fedmsg01.stg.iad2.fedoraproject.org - [centos_ipa_client_stg] centos-ipa-client01.stg.iad2.fedoraproject.org centos-ipa-client02.stg.iad2.fedoraproject.org @@ -623,7 +617,6 @@ autosign01.stg.iad2.fedoraproject.org # basset01.stg.iad2.fedoraproject.org blockerbugs01.stg.iad2.fedoraproject.org bodhi-backend01.stg.iad2.fedoraproject.org -bugzilla2fedmsg01.stg.iad2.fedoraproject.org bvmhost-x86-01.stg.iad2.fedoraproject.org bvmhost-x86-02.stg.iad2.fedoraproject.org bvmhost-x86-03.stg.iad2.fedoraproject.org @@ -708,6 +701,7 @@ sign-bridge01.stg.iad2.fedoraproject.org sign-vault01.stg.iad2.fedoraproject.org sundries01.stg.iad2.fedoraproject.org value01.stg.iad2.fedoraproject.org +value02.stg.iad2.fedoraproject.org vmhost-x86-01.stg.iad2.fedoraproject.org vmhost-x86-02.stg.iad2.fedoraproject.org vmhost-x86-03.stg.iad2.fedoraproject.org @@ -767,6 +761,7 @@ value01.iad2.fedoraproject.org [value_stg] value01.stg.iad2.fedoraproject.org +value02.stg.iad2.fedoraproject.org [virthost] vmhost-x86-01.stg.iad2.fedoraproject.org @@ -847,25 +842,17 @@ proxies busgateway_stg proxies_stg -[moksha_hubs:children] -bugzilla2fedmsg - -[moksha_hubs_stg:children] -bugzilla2fedmsg_stg - [fedmsg_services:children] fedmsg_hubs fedmsg_ircs fedmsg_relays fedmsg_gateways -moksha_hubs [fedmsg_services_stg:children] fedmsg_hubs_stg fedmsg_ircs_stg fedmsg_relays_stg fedmsg_gateways_stg -moksha_hubs_stg # These are groups that are using the python34 fedmsg stack. [python34_fedmsg:children] @@ -996,10 +983,10 @@ copr_aws copr_dev_aws [copr_hypervisor] -#vmhost-x86-copr01.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 -vmhost-x86-copr04.rdu-cc.fedoraproject.org +#vmhost-x86-copr04.rdu-cc.fedoraproject.org [copr_db_all:children] copr_db_stg diff --git a/main.yml b/main.yml index 70a21d50d0..cfabe01d73 100644 --- a/main.yml +++ b/main.yml @@ -19,7 +19,6 @@ - import_playbook: /srv/web/infra/ansible/playbooks/groups/batcave.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/blockerbugs.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/bodhi-backend.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/bugzilla2fedmsg.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/buildhw.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/buildvm.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/busgateway.yml diff --git a/playbooks/groups/bugzilla2fedmsg.yml b/playbooks/groups/bugzilla2fedmsg.yml deleted file mode 100644 index c25c5516a8..0000000000 --- a/playbooks/groups/bugzilla2fedmsg.yml +++ /dev/null @@ -1,53 +0,0 @@ -# create a new bugzilla2fedmsg server -# NOTE: should be used with --limit most of the time -# NOTE: make sure there is room/space for this server on the vmhost -# NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars - -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bugzilla2fedmsg:bugzilla2fedmsg_stg" - -- name: dole out the generic configuration - hosts: bugzilla2fedmsg:bugzilla2fedmsg_stg - user: root - gather_facts: True - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - roles: - - base - - rkhunter - - nagios_client - - hosts - - ipa/client - - sudo - - collectd/base - - fedmsg/base - - pre_tasks: - - import_tasks: "{{ tasks_path }}/yumrepos.yml" - - tasks: - - import_tasks: "{{ tasks_path }}/motd.yml" - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" - -- name: dole out the service-specific config - hosts: bugzilla2fedmsg:bugzilla2fedmsg_stg - user: root - gather_facts: True - - roles: - - bugzilla2fedmsg - - role: collectd/fedmsg-service - process: moksha-hub - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/copr-db.yml b/playbooks/groups/copr-db.yml index 1f6c5a9ce9..a46b3bf161 100644 --- a/playbooks/groups/copr-db.yml +++ b/playbooks/groups/copr-db.yml @@ -35,7 +35,6 @@ - sudo tasks: - - import_tasks: "{{ tasks_path }}/2fa_client.yml" when: env != "staging" - import_tasks: "{{ tasks_path }}/motd.yml" diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml index a5238e8ec9..b096276db7 100644 --- a/playbooks/groups/download.yml +++ b/playbooks/groups/download.yml @@ -39,8 +39,8 @@ - rsyncd - { role: nfs/client, when: datacenter == "iad2" or datacenter == "rdu", mnt_dir: '/srv/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } - { role: nfs/client, when: datacenter == "iad2" or datacenter == "rdu", mnt_dir: '/srv/pub/archive', nfs_src_dir: 'fedora_ftp_archive' } - - { role: nfs/client, when: datacenter == "iad2", mnt_dir: '/mnt/koji', nfs_src_dir: 'fedora_koji/koji/' } # needed for internal sync and odcs - - { role: nfs/client, when: datacenter == "iad2", mnt_dir: '/srv/odcs', nfs_src_dir: 'fedora_odcs' } # needed for internal sync + - { role: nfs/client, when: datacenter == "iad2", mnt_dir: '/mnt/fedora_koji', nfs_src_dir: 'fedora_koji' } # needed for internal sync and odcs + - { role: nfs/client, when: datacenter == "iad2", mnt_dir: '/mnt/odcs', nfs_src_dir: 'fedora_odcs' } # needed for internal sync - sudo pre_tasks: @@ -73,6 +73,9 @@ copy: src="{{ files }}/download/download-sync.cron.cc-rdu01" dest=/etc/cron.d/download-sync owner=root group=root mode=644 when: inventory_hostname == 'download-cc-rdu01.fedoraproject.org' + - name: make a mnt/koji link + file: state=link src=/mnt/fedora_koji/koji dest=/mnt/koji + handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml index dd215a98e4..e4d2d7077d 100644 --- a/playbooks/groups/mirrormanager.yml +++ b/playbooks/groups/mirrormanager.yml @@ -19,8 +19,8 @@ - ipa/client - sudo - collectd/base - - { role: nfs/client, when: inventory_hostname.startswith('mm-backend01'), mnt_dir: '/srv/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } - - { role: nfs/client, when: inventory_hostname.startswith('mm-backend01'), mnt_dir: '/srv/pub/archive', nfs_src_dir: 'fedora_ftp_archive' } + - { role: nfs/client, when: inventory_hostname.startswith('mm-backend01'), mnt_dir: '/srv/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub', mount_stg: true } + - { role: nfs/client, when: inventory_hostname.startswith('mm-backend01'), mnt_dir: '/srv/pub/archive', nfs_src_dir: 'fedora_ftp_archive', mount_stg: true } pre_tasks: - import_tasks: "{{ tasks_path }}/yumrepos.yml" diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml index d49b4145fe..47eb586eb4 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -85,21 +85,3 @@ handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" - -#- name: setup fedmsg on pkgs -# hosts: pkgs01.iad2.fedoraproject.org -# user: root -# gather_facts: True -# -# vars_files: -# - /srv/web/infra/ansible/vars/global.yml -# - "/srv/private/ansible/vars.yml" -# - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml -# -# roles: -# - { role: collectd/fedmsg-service, process: fedmsg-hub } -# - fedmsg/base -# - fedmsg/hub -# -# handlers: -# - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index 9b7a070a0e..660f2fdc61 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -117,8 +117,6 @@ nfs_src_dir: "{{ koji_hub_nfs }}" when: "'releng_compose_stg' in group_names" - - fedmsg/base - - role: rabbit/user username: "pungi{{ env_suffix }}" diff --git a/playbooks/groups/retrace.yml b/playbooks/groups/retrace.yml index 6e8a38a675..f7c631ca60 100644 --- a/playbooks/groups/retrace.yml +++ b/playbooks/groups/retrace.yml @@ -66,6 +66,7 @@ - import_role: name=hosts - import_role: name=openvpn/client - import_role: name=ipa/client + when: env != 'staging' - import_role: name=rkhunter - import_role: name=nagios_client - import_role: name=sudo diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml index 068d4b7999..f37f94d8b7 100644 --- a/playbooks/groups/sundries.yml +++ b/playbooks/groups/sundries.yml @@ -51,6 +51,8 @@ when: master_sundries_node|bool - role: developer/build when: master_sundries_node|bool + - role: fedoraloveskde/build + when: master_sundries_node|bool - { role: rabbit/user, username: "sundries{{ env_suffix }}", when: master_sundries_node|bool and deployment_type == "stg" } diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml index 163dc18cfe..496f55ba5c 100644 --- a/playbooks/groups/value.yml +++ b/playbooks/groups/value.yml @@ -20,17 +20,20 @@ - ipa/client - collectd/base - apache - - fedmsg/base + - { role: fedmsg/base, + when: inventory_hostname.startswith('value01') } # Set up for fedora-messaging - { role: rabbit/user, username: "value{{ env_suffix }}"} - - fedmsg/irc + - { role: fedmsg/irc, + when: inventory_hostname.startswith('value01') } - supybot - sudo - rsyncd - role: collectd/fedmsg-service process: fedmsg-irc - - mote + - { role: mote, + when: inventory_hostname.startswith('value01') } pre_tasks: - import_tasks: "{{ tasks_path }}/yumrepos.yml" diff --git a/playbooks/hosts/cloud-noc-os01.rdu-cc.fedoraproject.org.yml b/playbooks/hosts/cloud-noc-os01.rdu-cc.fedoraproject.org.yml index 47e23b5264..8dad7675d4 100644 --- a/playbooks/hosts/cloud-noc-os01.rdu-cc.fedoraproject.org.yml +++ b/playbooks/hosts/cloud-noc-os01.rdu-cc.fedoraproject.org.yml @@ -27,7 +27,6 @@ - import_tasks: "{{ tasks_path }}/yumrepos.yml" tasks: - - import_tasks: "{{ tasks_path }}/2fa_client.yml" - import_tasks: "{{ tasks_path }}/motd.yml" - name: install some packages which arent in playbooks diff --git a/playbooks/hosts/cloud-noc01.fedorainfracloud.org.yml b/playbooks/hosts/cloud-noc01.fedorainfracloud.org.yml index 40aa8cf3c6..96b0c4fd0f 100644 --- a/playbooks/hosts/cloud-noc01.fedorainfracloud.org.yml +++ b/playbooks/hosts/cloud-noc01.fedorainfracloud.org.yml @@ -27,7 +27,6 @@ - import_tasks: "{{ tasks_path }}/yumrepos.yml" tasks: - - import_tasks: "{{ tasks_path }}/2fa_client.yml" - import_tasks: "{{ tasks_path }}/motd.yml" - name: check if ntpd port is already known by selinux diff --git a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml index 62e8e32781..70a4285c44 100644 --- a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml +++ b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml @@ -31,7 +31,6 @@ - web-data-analysis tasks: - - import_tasks: "{{ tasks_path }}/2fa_client.yml" - import_tasks: "{{ tasks_path }}/motd.yml" handlers: diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml index 2e3b6384cb..8e60810751 100644 --- a/playbooks/include/proxies-fedora-web.yml +++ b/playbooks/include/proxies-fedora-web.yml @@ -60,3 +60,6 @@ - role: developer/website website: developer.fedoraproject.org + + - role: fedoraloveskde/website + website: fedoraloveskde.org diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml index bb2433ccfc..3cb32aa888 100644 --- a/playbooks/include/proxies-redirects.yml +++ b/playbooks/include/proxies-redirects.yml @@ -872,13 +872,3 @@ website: qa.fedoraproject.org path: / target: https://fedoraproject.org/wiki/QA - - # redirects for debuginfod main page; subdirs are reverse-proxied - - role: httpd/redirect - shortname: debuginfod - website: debuginfod.fedoraproject.org - regex: ^/$ - target: https://fedoraproject.org/wiki/Debuginfod - tags: - - debuginfod - diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 6f456a1465..7e5cdf48a9 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -233,14 +233,6 @@ destname: badges proxyurl: http://localhost:10032 - - role: httpd/reverseproxy - website: apps.fedoraproject.org - destname: fedocal - remotepath: /calendar - localpath: /calendar - header_scheme: true - proxyurl: "{{ varnish_url }}" - - role: httpd/reverseproxy website: apps.fedoraproject.org destname: kerneltest @@ -757,3 +749,10 @@ proxyopts: "connectiontimeout=600 timeout=600 keepalive=on" tags: - debuginfod + + - role: httpd/reverseproxy + website: packages.fedoraproject.org + destname: fedora-packages-static + balancer_name: app-os + targettype: openshift + keephost: true diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 69b84346d9..2595ee883c 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -616,6 +616,14 @@ sslonly: true cert_name: "{{wildcard_cert_name}}" + - role: httpd/website + site_name: fedoraloveskde.org + server_aliases: [stg.fedoraloveskde.org] + sslonly: true + certbot: true + tags: + - fedoraloveskde + - role: httpd/website site_name: osbs.fedoraproject.org server_aliases: [osbs.stg.fedoraproject.org] @@ -1055,3 +1063,9 @@ site_name: ols.fedoraproject.org sslonly: true cert_name: "{{wildcard_cert_name}}" + + - role: httpd/website + site_name: packages.fedoraproject.org + server_aliases: [packages.stg.fedoraproject.org] + sslonly: true + cert_name: "{{wildcard_cert_name}}" diff --git a/playbooks/manual/rebuild/websites.yml b/playbooks/manual/rebuild/websites.yml index d1400ab7f4..74972d73fc 100644 --- a/playbooks/manual/rebuild/websites.yml +++ b/playbooks/manual/rebuild/websites.yml @@ -34,3 +34,4 @@ - spins.fedoraproject.org - start.fedoraproject.org - budget.fedoraproject.org + - fedoraloveskde.org diff --git a/playbooks/manual/staging-sync/koji.yml b/playbooks/manual/staging-sync/koji.yml index 693b37a957..a6e4c38528 100644 --- a/playbooks/manual/staging-sync/koji.yml +++ b/playbooks/manual/staging-sync/koji.yml @@ -97,8 +97,8 @@ - wipe-fs tasks: - - name: stop nfs - service: name=nfs state=stopped + - name: stop nfs-server + service: name=nfs-server state=stopped - name: unmount /mnt/fedora_koji/koji/ostree mount: name=/mnt/fedora_koji/koji/ostree state=unmounted - name: unmount /mnt/fedora_koji/koji/compose/ostree @@ -124,8 +124,8 @@ # TODO recreate directories under /mnt/koji/compose (which ones?) that composer expects to exist - name: symlink production volume file: src=/mnt/fedora_koji_prod/koji dest=/mnt/koji/vol/prod state=link - - name: restart nfs - service: name=nfs state=started + - name: restart nfs-server + service: name=nfs-server state=started - name: restart httpd service: name=httpd state=started - name: restart kojira diff --git a/playbooks/openshift-apps/bugzilla2fedmsg.yml b/playbooks/openshift-apps/bugzilla2fedmsg.yml index 2ce98ebcee..34161512fd 100644 --- a/playbooks/openshift-apps/bugzilla2fedmsg.yml +++ b/playbooks/openshift-apps/bugzilla2fedmsg.yml @@ -1,5 +1,5 @@ - name: make the app be real - hosts: os_masters_stg[0] + hosts: os_masters[0]:os_masters_stg[0] user: root gather_facts: False diff --git a/playbooks/openshift-apps/fedora-packages-static.yml b/playbooks/openshift-apps/fedora-packages-static.yml index 15923e177d..9646ca616c 100644 --- a/playbooks/openshift-apps/fedora-packages-static.yml +++ b/playbooks/openshift-apps/fedora-packages-static.yml @@ -49,10 +49,27 @@ app: fedora-packages-static routename: fedora-packages-static host: "packages{{ env_suffix }}.fedoraproject.org" - serviceport: 80-tcp + serviceport: 8080-tcp servicename: fedora-packages-static - role: openshift/object app: fedora-packages-static template: deploymentconfig.yml objectname: deploymentconfig.yml + +############################################### +# actions to delete the project from OpenShift +############################################### +# to run: sudo rbac-playbook -l staging -t delete openshift-apps/fedora-packages-static.yml + - role: openshift/object-delete + app: fedora-packages-static + objecttype: project + objectname: fedora-packages-static + tags: [ never, delete ] + + # to run: sudo rbac-playbook -l staging -t deletesolr openshift-apps/fedora-packages-static.yml + - role: openshift/object-delete + app: solr + objecttype: project + objectname: solr + tags: [ never, deletesolr ] diff --git a/playbooks/openshift-apps/resultsdb.yml b/playbooks/openshift-apps/resultsdb.yml new file mode 100644 index 0000000000..b208ca3028 --- /dev/null +++ b/playbooks/openshift-apps/resultsdb.yml @@ -0,0 +1,111 @@ +- name: setup the database + # hosts: db01.iad2.fedoraproject.org:db01.stg.iad2.fedoraproject.org + hosts: db01.stg.iad2.fedoraproject.org + gather_facts: no + become: yes + become_user: postgres + vars_files: + - /srv/web/infra/ansible/vars/global.yml + - /srv/private/ansible/vars.yml + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml + + tasks: + - name: resultsdb DB user - prod + postgresql_user: + name: "resultsdb" + password: "{{ prod_resultsdb_db_password }}" + when: env != 'staging' + - name: resultsdb DB user - staging + postgresql_user: + name: "resultsdb" + password: "{{ stg_resultsdb_db_password }}" + when: env == 'staging' + - name: resultsdb database creation + postgresql_db: + name: "resultsdb" + owner: "resultsdb" + encoding: UTF-8 + + +- name: make the app be real + # hosts: os_masters[0]:os_masters_stg[0] + hosts: os_masters_stg[0] + user: root + gather_facts: False + + vars_files: + - /srv/web/infra/ansible/vars/global.yml + - "/srv/private/ansible/vars.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml + # TODO: change to vars/{{ env }}.yml + - /srv/web/infra/ansible/roles/openshift-apps/resultsdb/vars/main.yml + + roles: + - role: rabbit/user + username: "resultsdb{{ env_suffix }}" + + # The openshift/project role breaks if the project already exists: + # https://pagure.io/fedora-infrastructure/issue/6404 + - role: openshift/project + app: resultsdb + description: resultsdb + appowners: + - ralph + - mjia + - dcallagh + - gnaponie + - cverna + - pingou + - lholecek + - vmaljulin + tags: + - apply-appowners + + - role: openshift/object + app: resultsdb + template: secrets.yml + objectname: secrets.yml + + - role: openshift/secret-file + app: resultsdb + secret_name: resultsdb-fedora-messaging-key + key: resultsdb.key + privatefile: "rabbitmq/{{env}}/pki/private/resultsdb{{env_suffix}}.key" + + - role: openshift/secret-file + app: resultsdb + secret_name: resultsdb-fedora-messaging-crt + key: resultsdb.crt + privatefile: "rabbitmq/{{env}}/pki/issued/resultsdb{{env_suffix}}.crt" + + - role: openshift/secret-file + app: resultsdb + secret_name: resultsdb-fedora-messaging-ca + key: resultsdb.ca + privatefile: "rabbitmq/{{env}}/pki/ca.crt" + + - role: openshift/object + app: resultsdb + template: configmaps.yml + objectname: configmaps.yml + + - role: openshift/object + app: resultsdb + template: services.yml + objectname: services.yml + + - role: openshift/route + app: resultsdb + routename: api-pretty + host: "resultsdb{{ env_suffix }}.fedoraproject.org" + serviceport: api + servicename: resultsdb-web + + - role: openshift/object + app: resultsdb + template: deploymentconfigs.yml + objectname: deploymentconfigs.yml + + - role: openshift/rollout + app: resultsdb + dcname: "resultsdb-test-{{ resultsdb_test_id }}-api" \ No newline at end of file diff --git a/playbooks/openshift-apps/solr.yml b/playbooks/openshift-apps/solr.yml deleted file mode 100644 index f6a81c0b59..0000000000 --- a/playbooks/openshift-apps/solr.yml +++ /dev/null @@ -1,55 +0,0 @@ -- name: Make solr - hosts: os_masters_stg[0] - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - roles: - - role: openshift/project - app: solr - description: Fedora solr apps - appowners: - - mymindstorm - - - role: openshift/object - app: solr - file: imagestream.yml - objectname: imagestream.yml - - - role: openshift/object - app: solr - template: storage.yml - objectname: storage.yml - - - role: openshift/object - app: solr - template: configmap.yml - objectname: configmap.yml - - - role: openshift/object - app: solr - file: service.yml - objectname: service.yml - - - role: openshift/object - app: solr - template: deploymentconfig.yml - objectname: deploymentconfig.yml - -- name: Link solr and fedora-packages-static networks - hosts: os_masters_stg[0] - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - name: Run oc adm command to link solr to other projects - command: "oc adm pod-network join-projects --to=solr fedora-packages-static" diff --git a/playbooks/openshift-apps/toddlers.yml b/playbooks/openshift-apps/toddlers.yml index 2e22f2e642..06d51a66ef 100644 --- a/playbooks/openshift-apps/toddlers.yml +++ b/playbooks/openshift-apps/toddlers.yml @@ -18,6 +18,7 @@ - mohanboddu - zlopez - scoady + - asaleh tags: - appowners diff --git a/playbooks/vhost_reboot.yml b/playbooks/vhost_reboot.yml index ee072b33d4..22ce2f92f8 100644 --- a/playbooks/vhost_reboot.yml +++ b/playbooks/vhost_reboot.yml @@ -59,11 +59,6 @@ os_delegate_via: os-master03 when: hostvars['os-master03.iad2.fedoraproject.org'].vmhost and hostvars[inventory_hostname].datacenter == 'iad2' - - name: drain OS node if necessary - command: oc adm drain {{inventory_hostname }} --ignore-daemonsets --delete-local-data - delegate_to: "{{os_delegate_via}}{{env_suffix}}.phx2.fedoraproject.org" - when: inventory_hostname.startswith(('os-node', 'os-master')) and hostvars[inventory_hostname].datacenter == 'phx2' - - name: drain OS node if necessary command: oc adm drain {{inventory_hostname }} --ignore-daemonsets --delete-local-data delegate_to: "{{os_delegate_via}}{{env_suffix}}.iad2.fedoraproject.org" diff --git a/roles/abrt/faf-post/defaults/main.yml b/roles/abrt/faf-post/defaults/main.yml index 61d58e18e0..f16bf90d57 100644 --- a/roles/abrt/faf-post/defaults/main.yml +++ b/roles/abrt/faf-post/defaults/main.yml @@ -4,3 +4,9 @@ archive_age: '+14' # Delete deferred reports deferred_age: '+7' + +# Directory for saving FAF database backups. +faf_backup_dir: /srv/faf/db-backup + +# Delete FAF database backups older than this period. +faf_old_backup_age: '+7' diff --git a/roles/abrt/faf-post/tasks/cron.yml b/roles/abrt/faf-post/tasks/cron.yml index 5bcb86b444..a09af1c584 100644 --- a/roles/abrt/faf-post/tasks/cron.yml +++ b/roles/abrt/faf-post/tasks/cron.yml @@ -1,24 +1,25 @@ --- - -- name: backup database - cron: - name: "backup database" - user: faf - job: "( pg_dump -Fc faf > /srv/faf/db-backup/backup-$(date '+\\%F').dump ) >> /var/log/faf/db_backup.log 2>&1" - special_time: daily - state: present - -- name: delete old database backups - cron: - name: "delete database backups older than X days" - user: faf - job: "find /srv/faf/db-backup/ -mtime +14 -type f -delete" - special_time: daily - state: present - -- name: Run crons when not devel +- name: Cron jobs for production machines block: - - name: pull associates + - name: Backup database daily + cron: + name: "backup database" + user: faf + job: > + ( pg_dump --format=custom --file={{ faf_backup_dir }}/backup-$(date '+\%F').dump faf ) + >> /var/log/faf/db_backup.log 2>&1 + special_time: daily + state: present + + - name: Delete old database backups + cron: + name: "delete database backups older than {{ faf_old_backup_age }} days" + user: faf + job: "find {{ faf_backup_dir }} -mtime {{ faf_old_backup_age }} -type f -delete" + special_time: daily + state: present + + - name: Pull associates cron: name: "cron for pull associates" user: faf @@ -34,35 +35,27 @@ special_time: daily state: present - - name: probable fixes + - name: Job for probable fixes in active Fedora releases cron: name: "cron for probable fixes for f{{ item }}" user: faf - job: "faf mark-probably-fixed -o fedora --opsys-release {{ item }} >> /var/log/faf/mark-probably-fixed-f{{ item }}.log 2>&1" + job: > + faf mark-probably-fixed -o fedora --opsys-release {{ item }} + >> /var/log/faf/mark-probably-fixed-f{{ item }}.log 2>&1 special_time: daily state: present - loop: - - "31" - - "32" - - "33" + loop: "{{ rs_internal_fedora_vers }}" - - name: remove obsolete probable fixes + - name: Remove job for probable fixes in removed Fedora releases cron: name: "cron for probable fixes for f{{ item }}" user: faf job: "faf mark-probably-fixed -o fedora --opsys-release {{ item }} >> /var/log/faf/mark-probably-fixed-f{{ item }}.log 2>&1" special_time: daily state: absent - loop: - - "24" - - "25" - - "26" - - "27" - - "28" - - "29" - - "30" + loop: "{{ rs_internal_fedora_vers_removed }}" - - name: update BZ bugs fedora + - name: Update BZ bugs fedora cron: name: "cron for update BZ bugs fedora" user: faf @@ -70,7 +63,7 @@ special_time: daily state: present - - name: update BZ bugs centos + - name: Update BZ bugs centos cron: name: "cron for update BZ bugs centos" user: faf @@ -78,7 +71,7 @@ special_time: daily state: present - - name: attach BZ bugs centos + - name: Attach BZ bugs centos cron: name: "cron for attach BZ bugs centos" user: faf @@ -86,16 +79,16 @@ special_time: daily state: present - - name: archive reports and attachments + - name: Archive reports and attachments cron: name: "faf archive reports and attachments" user: faf job: "faf archive-reports -d >> /var/log/faf/archive-reports.log 2>&1" special_time: daily state: present - when: not devel|bool + when: env != 'staging' -- name: install cron for deleting old archives +- name: Cron job for deleting old archives cron: name: "rotate_faf_archives" special_time: "daily" diff --git a/roles/abrt/faf-post/tasks/main.yml b/roles/abrt/faf-post/tasks/main.yml index 898bfc426d..167758208c 100644 --- a/roles/abrt/faf-post/tasks/main.yml +++ b/roles/abrt/faf-post/tasks/main.yml @@ -1,42 +1,50 @@ --- # the magic with ! is that it return exit code 1 if 'already defined' is not present in output -- name: add repositories - shell: ! faf repoadd --nogpgcheck "{{ item.name }}" dnf "{{ item.url | join('" "') }}" 2>&1 | grep 'already defined' +- name: Add package repositories + shell: > + ! faf repoadd --nogpgcheck "{{ item.name }}" dnf "{{ item.url | join('" "') }}" 2>&1 | grep 'already defined' become: yes become_user: faf ignore_errors: yes - when: not devel|bool tags: add_repo loop: "{{ faf_repos }}" -- name: repoassign repositories - command: faf repoassign "{{ item.name }}" "{{ item.opsys }}" "{{ item.arch }}" +- name: Assign repositories to releases + command: "faf repoassign '{{ item.name }}' '{{ item.opsys }}' '{{ item.arch }}'" become: yes become_user: faf - when: not devel|bool tags: add_repo loop: "{{ faf_repos }}" +- name: Ensure directory for FAF database backups exists + file: + path: "{{ faf_backup_dir }}" + state: directory + owner: faf + group: faf + mode: 0750 + when: env != 'staging' + - import_tasks: cron.yml tags: cron -- name: get repolist of EOL releases +- name: List repositories of EOL releases shell: "faf repolist | grep fedora-{{ item }} || true" + become: yes + become_user: faf register: eol_repolist loop: "{{ rs_internal_fedora_vers_removed }}" changed_when: eol_repolist.stdout + +- name: Remove repositories of EOL releases + command: "faf repodel '{{ item }}'" become: yes become_user: faf - -- name: remove repos of EOLed releases - command: faf repodel "{{ item }}" + ignore_errors: yes loop: "{{ eol_repolist.results | map(attribute='stdout_lines') | flatten }}" - become: faf - become_user: faf -- name: cleanup packages from EOLed fedora release - command: "faf cleanup-packages Fedora '{{ item }}' " +- name: Clean up packages from EOL Fedora releases + command: "faf cleanup-packages Fedora '{{ item }}'" become: yes become_user: faf - when: not devel|bool loop: "{{ rs_internal_fedora_vers_removed }}" diff --git a/roles/abrt/faf/meta/.galaxy_install_info b/roles/abrt/faf/meta/.galaxy_install_info index 928caa4a4c..d014cfad01 100644 --- a/roles/abrt/faf/meta/.galaxy_install_info +++ b/roles/abrt/faf/meta/.galaxy_install_info @@ -1,2 +1,2 @@ -install_date: Fri Mar 27 19:49:42 2020 +install_date: Thu May 27 08:27:11 2021 version: master diff --git a/roles/abrt/faf/tasks/cleanup.yml b/roles/abrt/faf/tasks/cleanup.yml index 28941d76f7..e5131097ca 100644 --- a/roles/abrt/faf/tasks/cleanup.yml +++ b/roles/abrt/faf/tasks/cleanup.yml @@ -4,7 +4,6 @@ loop: "{{ eol_opsys | selectattr('opsys') | selectattr('release') | list }}" become: yes become_user: faf - register: remove_eoled_output failed_when: false changed_when: false diff --git a/roles/abrt/retrace-post/defaults/main.yml b/roles/abrt/retrace-post/defaults/main.yml index 2d77c3b9e8..fb1633d481 100644 --- a/roles/abrt/retrace-post/defaults/main.yml +++ b/roles/abrt/retrace-post/defaults/main.yml @@ -1,8 +1,8 @@ --- # List of fedora versions for reposync -rs_internal_fedora_vers: [32, 33, 34, rawhide] -rs_internal_fedora_vers_removed: [24, 25, 26, 27, 28, 29, 30, 31] +rs_internal_fedora_vers: [33, 34, rawhide] +rs_internal_fedora_vers_removed: [24, 25, 26, 27, 28, 29, 30, 31, 32] # List of architectures for reposync # armhfp disabled untill we get more space diff --git a/roles/abrt/retrace-post/tasks/cron.yml b/roles/abrt/retrace-post/tasks/cron.yml index b0b5f36949..f8b585797a 100644 --- a/roles/abrt/retrace-post/tasks/cron.yml +++ b/roles/abrt/retrace-post/tasks/cron.yml @@ -1,6 +1,5 @@ --- - -- name: Create cron job for retrace-server +- name: Create retrace-server reposync cron jobs for active Fedora versions cron: name: "rs reposync fedora {{ item[0] }} {{ item[1] }}" user: retrace @@ -8,9 +7,8 @@ special_time: daily state: present loop: "{{ rs_internal_fedora_vers | product(rs_internal_arch_list) | list }}" - when: not devel|bool -- name: Remove obsolete cron job for retrace-server +- name: Remove retrace-server reposync cron jobs of removed Fedora versions cron: name: "rs reposync fedora {{ item[0] }} {{ item[1] }}" user: retrace @@ -18,25 +16,22 @@ special_time: daily state: absent loop: "{{ rs_internal_fedora_vers_removed | product(rs_internal_arch_list) | list}}" - when: not devel|bool -- name: Create cron job for retrace-server +- name: Create retrace-server reposync cron job for CentOS 7 cron: name: "rs reposync centos 7 x86_64" user: retrace job: "/usr/bin/retrace-server-reposync centos 7 x86_64 >> /var/log/retrace-server/reposync_error.log 2>&1" special_time: daily state: present - when: not devel|bool -- name: Create cron job for retrace-server +- name: Create retrace-server cleanup cron job cron: name: "retrace-server-cleanup" user: retrace job: "/usr/bin/retrace-server-cleanup >> /var/log/retrace-server/cleanup_error.log 2>&1" special_time: daily state: present - when: not devel|bool - name: Create cron job for retrace-server cron: @@ -45,4 +40,3 @@ job: "/usr/bin/podman system prune --all --force >> /var/log/retrace-server/podman_prune.log 2>&1" special_time: daily state: present - when: not devel|bool diff --git a/roles/abrt/retrace-post/tasks/main.yml b/roles/abrt/retrace-post/tasks/main.yml index 1b06bcbe42..3c905f5d7a 100644 --- a/roles/abrt/retrace-post/tasks/main.yml +++ b/roles/abrt/retrace-post/tasks/main.yml @@ -3,6 +3,7 @@ # Setup retrace-server - import_tasks: retrace_setup.yml -# Set up cron jobs for retrace-server +# Set up production cron jobs for retrace-server - import_tasks: cron.yml tags: cron + when: env != 'staging' diff --git a/roles/abrt/retrace-post/tasks/retrace_setup.yml b/roles/abrt/retrace-post/tasks/retrace_setup.yml index edac160c78..c7692b12e9 100644 --- a/roles/abrt/retrace-post/tasks/retrace_setup.yml +++ b/roles/abrt/retrace-post/tasks/retrace_setup.yml @@ -7,14 +7,14 @@ become: yes become_user: retrace tags: [rs_reposync, rs_fedora] - when: not devel|bool + when: env != 'staging' - name: reposync for centos shell: nohup retrace-server-reposync centos 7 x86_64 $(mktemp /tmp/ansible.reposync_for_centosXXXXXX.log) & become: yes become_user: retrace tags: [rs_reposync, rs_fedora] - when: not devel|bool + when: env != 'staging' - file: path: /srv/retrace/repos diff --git a/roles/abrt/retrace-pre/defaults/main.yml b/roles/abrt/retrace-pre/defaults/main.yml new file mode 100644 index 0000000000..490f879e53 --- /dev/null +++ b/roles/abrt/retrace-pre/defaults/main.yml @@ -0,0 +1,3 @@ +--- +retrace_user_home: /srv/retrace/home +retrace_user_uid_gid: 174 diff --git a/roles/abrt/retrace-pre/tasks/main.yml b/roles/abrt/retrace-pre/tasks/main.yml index ec17ee00b1..2b107da4d5 100644 --- a/roles/abrt/retrace-pre/tasks/main.yml +++ b/roles/abrt/retrace-pre/tasks/main.yml @@ -1,16 +1,52 @@ --- -# create uid - this is normaly done by retrace package -# but the package is not installed yet at this momement -- user: name="retrace" group=retrace uid=174 home=/srv/retrace/home +- name: Make sure retrace user exists + user: + name: retrace + group: retrace + system: yes + create_home: no + register: retrace_user_info -- file: +- name: Ensure retrace user has correct UID and home directory + when: > + retrace_user_info.changed or + retrace_user_info.uid != retrace_user_uid_gid or + retrace_user_info.home != retrace_user_home + block: + - name: Stop httpd service before modifying user + service: + name: httpd + state: stopped + + # create uid - this is normaly done by retrace package + # but the package is not installed yet at this momement + - name: Ensure correct UID and home directory + user: + name: retrace + uid: "{{ retrace_user_uid_gid }}" + home: "{{ retrace_user_home }}" + create_home: yes + + - name: Ensure correct GID + group: + name: retrace + gid: "{{ retrace_user_uid_gid }}" + + - name: Restart httpd service after modifications are done + service: + name: httpd + state: started + +- name: Create directory for repositories + file: path: /srv/retrace/repos state: directory mode: 0755 owner: retrace group: retrace -- file: +- name: Create directory for retrace tasks + file: path: /srv/retrace/tasks state: directory mode: 0755 @@ -23,10 +59,3 @@ mode: 0755 owner: retrace group: retrace - -- file: - path: /srv/retrace/home - state: directory - mode: 0755 - owner: retrace - group: retrace diff --git a/roles/abrt/retrace/defaults/main.yml b/roles/abrt/retrace/defaults/main.yml index d25b03bfea..8757afb331 100644 --- a/roles/abrt/retrace/defaults/main.yml +++ b/roles/abrt/retrace/defaults/main.yml @@ -15,6 +15,9 @@ rs_allow_interactive: false # Allow X-CoreFileDirectory header rs_allow_external_dir: false +# Expose metrics for monitoring via Prometheus +rs_allow_metrics: true + # Allow to create tasks owned by task manager (security risk) rs_allow_task_manager: false @@ -93,6 +96,9 @@ rs_keep_rawhide_latest: 3 # Repo used to install chroot for vmcores rs_kernel_chroot_repo: http://dl.fedoraproject.org/pub/fedora/linux/releases/16/Everything/$ARCH/os/ +# Path to the kernel (vmcore) debugger +rs_kernel_debugger_path: /usr/bin/crash + # Koji directory structure can be used to search for kernel debuginfo rs_koji_root: /mnt/koji @@ -128,8 +134,9 @@ rs_use_faf_packages: false # Spool directory for FAF packages faf_spool_dir: /var/spool/faf -# Run the retrace in a Mock chroot (default), or a Podman container -# (mock|podman) +# Run the retrace in a Mock chroot (default), a Podman container, +# or on the native machine. +# (mock|podman|native) rs_retrace_environment: podman # Whether to enable e-mail notifications @@ -183,17 +190,10 @@ rs_force_reinstall: false # Check server health after installation rs_check_health: true -# Path to the executable hook scripts -# https://github.com/abrt/retrace-server/wiki/Hook-scripts -rs_hooks_executable_path: /usr/libexec/retrace-server/hooks/ - -# Global time limit for hook scripts (in seconds) -rs_hooks_global_timeout: 300 - # Hostname hostname: example.org -# Path to the executable hook scripts +# Path to the executable hook scripts # see https://github.com/abrt/retrace-server/wiki/Hook-scripts rs_executable_hooks_path: "/usr/libexec/retrace-server/hooks/" diff --git a/roles/abrt/retrace/meta/.galaxy_install_info b/roles/abrt/retrace/meta/.galaxy_install_info index 5655a5edcb..4e65b113df 100644 --- a/roles/abrt/retrace/meta/.galaxy_install_info +++ b/roles/abrt/retrace/meta/.galaxy_install_info @@ -1,2 +1,2 @@ -install_date: Fri Mar 27 19:49:44 2020 +install_date: Thu May 27 08:27:12 2021 version: master diff --git a/roles/abrt/retrace/meta/main.yml b/roles/abrt/retrace/meta/main.yml index ca93f0e38a..48a9303dfe 100644 --- a/roles/abrt/retrace/meta/main.yml +++ b/roles/abrt/retrace/meta/main.yml @@ -1,19 +1,18 @@ --- galaxy_info: author: sorki - description: Deploy retrace-server + description: Retrace Server deployment license: BSD - min_ansible_version: 1.9 + min_ansible_version: 2.8 platforms: - name: EL versions: - 7 + - 8 - name: Fedora versions: - - 26 - - 27 - - 28 + - 33 + - 34 + - 35 galaxy_tags: - system -#dependencies: -# - { role: httpd } diff --git a/roles/abrt/retrace/tasks/config.yml b/roles/abrt/retrace/tasks/config.yml index 94009a3123..72f0136cf3 100644 --- a/roles/abrt/retrace/tasks/config.yml +++ b/roles/abrt/retrace/tasks/config.yml @@ -3,16 +3,19 @@ template: src: etc-retrace-server.conf.j2 dest: /etc/retrace-server/retrace-server.conf + mode: 0644 notify: restart httpd - name: retrace-server http config template: src: retrace-server-httpd.conf.j2 dest: /etc/httpd/conf.d/retrace-server-httpd.conf + mode: 0644 notify: restart httpd - name: configure retrace-server hooks config template: src: etc-retrace-server-hooks.conf.j2 dest: /etc/retrace-server/retrace-server-hooks.conf + mode: 0644 notify: restart httpd diff --git a/roles/abrt/retrace/tasks/podman.yml b/roles/abrt/retrace/tasks/podman.yml index 6a61c859b2..4d3adcaf62 100644 --- a/roles/abrt/retrace/tasks/podman.yml +++ b/roles/abrt/retrace/tasks/podman.yml @@ -1,5 +1,5 @@ --- -- name: Install podman package +- name: Install Podman package package: name: podman state: present @@ -18,7 +18,7 @@ - name: Get last subuid entry shell: | set -o pipefail - cut -d ':' -f2 /etc/subuid | sort | tail -1 + sort -nrt: -k2 /etc/subuid | awk -F: 'NR == 1 { print $2 }' changed_when: false register: t_subuid args: @@ -59,7 +59,7 @@ when: '"retrace" not in retrace_subgid.stdout' -- name: Start httpd afterretrace user modification +- name: Start httpd after retrace user modification service: name: httpd state: started diff --git a/roles/abrt/retrace/templates/etc-retrace-server.conf.j2 b/roles/abrt/retrace/templates/etc-retrace-server.conf.j2 index 0a090bd92d..d36c7b77f9 100644 --- a/roles/abrt/retrace/templates/etc-retrace-server.conf.j2 +++ b/roles/abrt/retrace/templates/etc-retrace-server.conf.j2 @@ -21,6 +21,9 @@ AllowInteractive = {{ rs_allow_interactive|int }} # Allow X-CoreFileDirectory header AllowExternalDir = {{ rs_allow_external_dir|int }} +# Expose metrics for monitoring via Prometheus +AllowMetrics = {{ rs_allow_metrics|int }} + # Allow to create tasks owned by task manager (security risk) AllowTaskManager = {{ rs_allow_task_manager|int }} @@ -135,8 +138,9 @@ UseFafPackages = {{ rs_use_faf_packages|int }} # Spool directory for FAF packages FafLinkDir = {{ faf_spool_dir }} -# Run the retrace in a Mock chroot (default), or a Podman container -# (mock|podman) +# Run the retrace in a Mock chroot (default), a Podman container, +# or on the native machine. +# (mock|podman|native) RetraceEnvironment = {{ rs_retrace_environment }} # Whether to enable e-mail notifications @@ -172,6 +176,9 @@ BugzillaRegExes = {{ rs_bugzilla_regexes }} # Timeout (in seconds) for communication with any process ProcessCommunicateTimeout = {{ rs_process_communicate_timeout|int }} +# Path to the kernel (vmcore) debugger +KernelDebuggerPath = {{ rs_kernel_debugger_path }} + [archhosts] {% for a in rs_archhosts %} {{ a.arch }} = {{ a.url|default('', true) }} diff --git a/roles/batcave/tasks/main.yml b/roles/batcave/tasks/main.yml index bdf78d20a1..7547ef3fd0 100644 --- a/roles/batcave/tasks/main.yml +++ b/roles/batcave/tasks/main.yml @@ -21,44 +21,6 @@ - packages - yumrepos -- name: install packages needed (rhel7) - package: name={{ item }} state=present - with_items: - - srm # secure rm to delete sensitive files. - - ansible # This is our ansible master, needs ansible installed. - - ansible-openstack-modules # Needed to manage cloud with ansible - - ansible-collection-community-general # various useful community modules for ansible - - yum-metadata-parser # Needed for rhn sync - - yum-rhn-plugin # Needed for rhn sync - - createrepo_c # Needed for rhn sync - - ostree # Needed for rhn sync - - python-sqlalchemy # Needed for repo2json - - pyliblzma # Needed for repo2json - - ansible_utils # Needed for rbac-playbook - - python-GeoIP # Needed for geoip scripts - - python-fedmsg-fasclient # fasClient fedmsg job - - bind # named-checkzone for dns repo - - emacs-nox - - rpm-sign # for the sign-and-import playbook - - createrepo # for the sign-and-import playbook - - unzip # general useful util - - fpaste # general useful util - - mtr # useful for network debugging - - lftp # needed to easily pull in builds from koji for internal repos - - git-email # needed to send patches for review to the mailing list - - python-dns # needed to have ansible remove ip-based known_host entries - - libvirt-client # needed to allow migrations to be run from here. - - ansible-lint # needed to check ansible playbooks for issues. - - atomic-openshift-clients # For convenient client access to os.fp.o - - easy-rsa # For easy copying into ansible-private for certs. - - dnf # To get dnf reposync - - dnf-plugins-core # To get dnf reposync - - fedora-messaging # To send/receive messages on the amqp bus - tags: - - batcave - - config - when: ansible_distribution_major_version|int == 7 - - name: install packages needed (rhel8) package: name={{ item }} state=present with_items: @@ -88,7 +50,6 @@ tags: - batcave - config - when: ansible_distribution_major_version|int == 8 - name: setup ssh_known_hosts file copy: src=ssh_known_hosts dest=/etc/ssh/ssh_known_hosts mode=0644 @@ -430,7 +391,7 @@ # - name: install the ansible_utils/rbac config - copy: src={{ private }}/files/rbac/rbac.yaml dest=/etc/ansible_utils/rbac.yaml mode=0500 + copy: src={{ private }}/files/rbac/rbac.yaml dest=/etc/ansible_utils/rbac.yaml mode=0540 group=sysadmin tags: - rbac - batcave @@ -455,16 +416,6 @@ - config when: inventory_hostname.startswith('batcave01.phx2') -# -# fasClient fedmsg job -# - -#- name: Install config for fedmsg tigger for fasClient runs -# copy: src=fedmsg-fasclient.py dest=/etc/fedmsg.d/fasclient.py mode=0644 -# tags: -# - batcave -# - config - # # set selinux context for /srv/web/infra # @@ -623,3 +574,28 @@ tags: - batcave - tmux + +# +# install psql to allow for some ro queries against db-datanommer01 +# + +- name: enable the postgresql 12 module for psql on batcave + copy: + dest: /etc/dnf/modules.d/postgresql.module + content: | + [postgresql] + name=postgresql + stream=12 + profiles= + state=enabled + tags: + - batcave + - postgres + +- name: install psql client + package: name=postgresql state=present + tags: + - batcave + - postgres + - config + - packages diff --git a/roles/blockerbugs/tasks/main.yml b/roles/blockerbugs/tasks/main.yml index 8eecca479c..baee50490e 100644 --- a/roles/blockerbugs/tasks/main.yml +++ b/roles/blockerbugs/tasks/main.yml @@ -20,6 +20,24 @@ - httpd - blockerbugs +- name: Ensure group `blockerbugs` exists + group: + name: blockerbugs + state: present + tags: + - blockerbugs + - config + +- name: create the `blockerbugs` user + user: + name: blockerbugs + group: blockerbugs + shell: /bin/nologin + home: /usr/share/blockerbugs + tags: + - blockerbugs + - config + - name: setup blockerbugs app settings file template: src=blockerbugs-settings.py.j2 dest=/etc/blockerbugs/settings.py mode=640 notify: diff --git a/roles/bodhi2/backend/files/bodhi-celery.service b/roles/bodhi2/backend/files/bodhi-celery.service index e17933f2a9..497bb19160 100644 --- a/roles/bodhi2/backend/files/bodhi-celery.service +++ b/roles/bodhi2/backend/files/bodhi-celery.service @@ -6,7 +6,7 @@ Wants = network-online.target [Service] User = apache Group = apache -ExecStart = /usr/bin/celery-3 worker -A bodhi.server.tasks.app -l info -Q has_koji_mount +ExecStart = /usr/bin/celery-3 -A bodhi.server.tasks.app worker -l info -Q has_koji_mount [Install] WantedBy = multi-user.target diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index 472b2bb7ba..6d629e8c3b 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -114,50 +114,6 @@ RELEASES = {'f34': {'topic': 'fedora', 'dest': os.path.join(FEDORAALTDEST, 'testing', '33', 'Modular')} ]}} }, - 'f32': {'topic': 'fedora', - 'version': '32', - 'modules': ['fedora', 'fedora-secondary'], - 'repos': {'updates': { - 'from': 'f32-updates', - 'ostrees': [{'ref': 'fedora/32/%(arch)s/updates/silverblue', - 'dest': OSTREEDEST, - 'arches': ['x86_64', 'ppc64le', 'aarch64']}], - 'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'], - 'dest': os.path.join(FEDORADEST, '32', 'Everything')}, - {'arches': ['ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, '32', 'Everything')} - ]}, - 'updates-testing': { - 'from': 'f32-updates-testing', - 'ostrees': [{'ref': 'fedora/32/%(arch)s/testing/silverblue', - 'dest': OSTREEDEST, - 'arches': ['x86_64', 'ppc64le', 'aarch64']}], - 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], - 'dest': os.path.join(FEDORADEST, 'testing', '32', 'Everything')}, - {'arches': ['ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, 'testing', '32', 'Everything')} - ]}} - }, - 'f32m': {'topic': 'fedora', - 'version': '32m', - 'modules': ['fedora', 'fedora-secondary'], - 'repos': {'updates': { - 'from': 'f32-modular-updates', - 'ostrees': [], - 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], - 'dest': os.path.join(FEDORADEST, '32', 'Modular')}, - {'arches': ['ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, '32', 'Modular')} - ]}, - 'updates-testing': { - 'from': 'f32-modular-updates-testing', - 'ostrees': [], - 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], - 'dest': os.path.join(FEDORADEST, 'testing', '32', 'Modular')}, - {'arches': ['ppc64le', 's390x'], - 'dest': os.path.join(FEDORAALTDEST, 'testing', '32', 'Modular')} - ]}} - }, 'epel8': {'topic': 'epel', 'version': '8', 'modules': ['epel'], @@ -172,6 +128,20 @@ RELEASES = {'f34': {'topic': 'fedora', 'dest': os.path.join(EPELDEST, '8', 'Everything')} ]}} }, + 'epel8n': {'topic': 'epel', + 'version': '8', + 'modules': ['epel'], + 'repos': {'epel-testing': { + 'from': 'epel8-next-testing', + 'to': [{'arches': ['x86_64', 'aarch64', 'ppc64le', 'source'], + 'dest': os.path.join(EPELDEST, 'testing', 'next', '8', 'Everything')} + ]}, + 'epel': { + 'from': 'epel8-next', + 'to': [{'arches': ['x86_64', 'aarch64', 'ppc64le', 'source'], + 'dest': os.path.join(EPELDEST, 'next', '8', 'Everything')} + ]}} + }, 'epel8m': {'topic': 'epel', 'version': '8m', 'modules': ['epel'], diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index 02e95ec06b..bf9d9ce5b5 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -76,7 +76,7 @@ # bodhi2/backend/files/koji_sync_listener.py # This cronjob runs only once a day. The listener script runs reactively. cron: name="owner-sync" minute="15" hour="4" user="root" - job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f35 f35-container f35-modular f34 f34-container f34-modular f33 f33-container f33-modular f33-flatpak f32 f32-container f32-modular f32-flatpak epel8 epel8-playground epel8-modular epel7 module-package-list modular'" + job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f35 f35-container f35-modular f34 f34-container f34-modular f33 f33-container f33-modular f33-flatpak epel8 epel8-playground epel8-modular epel7 module-package-list modular'" cron_file=update-koji-owner when: env == "production" tags: diff --git a/roles/bodhi2/backend/templates/koji_sync_listener.toml b/roles/bodhi2/backend/templates/koji_sync_listener.toml index bfd94186e8..5f90458974 100644 --- a/roles/bodhi2/backend/templates/koji_sync_listener.toml +++ b/roles/bodhi2/backend/templates/koji_sync_listener.toml @@ -48,10 +48,6 @@ taglist = [ "f33-container", "f33-modular", "f33-flatpak", - "f32", - "f32-container", - "f32-modular", - "f32-flatpak", "epel8", "epel8-playground", "epel8-modular", diff --git a/roles/bodhi2/backend/templates/owner-sync-pagure.j2 b/roles/bodhi2/backend/templates/owner-sync-pagure.j2 index 11859c0dd3..76c904d4d9 100755 --- a/roles/bodhi2/backend/templates/owner-sync-pagure.j2 +++ b/roles/bodhi2/backend/templates/owner-sync-pagure.j2 @@ -369,6 +369,11 @@ def set_koji_ownership(tag, namespace, packages, arches, verbose=False): for pkg in packages: owner = get_pagure_project_owner(namespace, pkg, verbose=verbose) + # When the user is created in fedora infra, they wont be added to koji + # until they logged into koji for the first time + # Set the owner to 'releng' until they logged into koji + if not session.getUser(owner): + owner = 'releng' if pkg not in koji_pkgs: extra_arches = None if pkg in EXTRA_ARCH_LIST: diff --git a/roles/bodhi2/base/templates/configmap.yml b/roles/bodhi2/base/templates/configmap.yml index 448978eeef..7d439064c8 100644 --- a/roles/bodhi2/base/templates/configmap.yml +++ b/roles/bodhi2/base/templates/configmap.yml @@ -29,7 +29,7 @@ data: .fedoraproject.org = FEDORAPROJECT.ORG fedoraproject.org = FEDORAPROJECT.ORG {% if env == "staging" %} - .stg.phx2.fedoraproject.org = STG.FEDORAPROJECT.ORG + .stg.iad2.fedoraproject.org = STG.FEDORAPROJECT.ORG {% endif %} .stg.fedoraproject.org = STG.FEDORAPROJECT.ORG stg.fedoraproject.org = STG.FEDORAPROJECT.ORG diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2 index 47535f00d1..43d3b6cfd5 100644 --- a/roles/bodhi2/base/templates/production.ini.j2 +++ b/roles/bodhi2/base/templates/production.ini.j2 @@ -245,6 +245,8 @@ fedora_epel_modular_8_stable_master_repomd = http://dl-iad05.fedoraproject.org/p fedora_epel_modular_8_testing_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/testing/%%s/Modular/%%s/repodata/repomd.xml fedora_epel_stable_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/%%s/%%s/repodata/repomd.xml fedora_epel_testing_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/testing/%%s/%%s/repodata/repomd.xml +fedora_epel_next_8_stable_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/next/%%s/Everything/%%s/repodata/repomd.xml +fedora_epel_next_8_testing_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/testing/next/%%s/Everything/%%s/repodata/repomd.xml fedora_modular_stable_master_repomd = http://dl-iad05.fedoraproject.org/pub/fedora/linux/updates/%%s/Modular/%%s/repodata/repomd.xml fedora_modular_testing_master_repomd = http://dl-iad05.fedoraproject.org/pub/fedora/linux/updates/testing/%%s/Modular/%%s/repodata/repomd.xml {% elif env == 'staging' %} @@ -604,6 +606,9 @@ f{{ FedoraRawhideNumber }}c.pre_beta.mandatory_days_in_testing = 0 # Rawhide gating - Updates in rawhide don't require any days in testing. f{{ FedoraRawhideNumber }}.status = pre_beta f{{ FedoraRawhideNumber }}.pre_beta.mandatory_days_in_testing = 0 +f{{ FedoraRawhideNumber }}.pre_beta.critpath.min_karma = 0 +f{{ FedoraRawhideNumber }}.pre_beta.critpath.stable_after_days_without_negative_karma = 0 + # ELN gating - Updates in ELN don't require any days in testing. eln.status = pre_beta @@ -696,9 +701,7 @@ debugtoolbar.hosts = 127.0.0.1 ::1 # suitable for a production environment. You can encode a username and password in the URL. For # example, postgresql://username:password@hostname/database_name # sqlalchemy.url = sqlite:////var/cache/bodhi.db -{% if env == 'production' and datacenter == 'phx2' %} -sqlalchemy.url = postgresql://bodhi2:{{ bodhi2Password }}@db-bodhi.phx2.fedoraproject.org/bodhi2 -{% elif env == 'production' and datacenter == 'iad2' %} +{% if env == 'production' %} sqlalchemy.url = postgresql://bodhi2:{{ bodhi2Password }}@db-bodhi.iad2.fedoraproject.org/bodhi2 {% elif env == 'staging' %} sqlalchemy.url = postgresql://bodhi2:{{ bodhi2PasswordSTG }}@db01.stg.iad2.fedoraproject.org/bodhi2 diff --git a/roles/bugzilla2fedmsg/tasks/main.yml b/roles/bugzilla2fedmsg/tasks/main.yml index 49afc994b2..bd9b3da9b8 100644 --- a/roles/bugzilla2fedmsg/tasks/main.yml +++ b/roles/bugzilla2fedmsg/tasks/main.yml @@ -60,6 +60,6 @@ - bugzilla2fedmsg - name: moksha-hub service - service: name=moksha-hub state=started enabled=yes + service: name=moksha-hub state=stopped enabled=no tags: - bugzilla2fedmsg diff --git a/roles/copr/backend/files/provision/builderpb-aws-spot-aarch64.yml b/roles/copr/backend/files/provision/builderpb-aws-spot-aarch64.yml new file mode 100644 index 0000000000..7d948c3e38 --- /dev/null +++ b/roles/copr/backend/files/provision/builderpb-aws-spot-aarch64.yml @@ -0,0 +1,52 @@ +--- +- name: create an aarch64 spot instance in aws + hosts: 127.0.0.1 + gather_facts: false + + roles: + - spawner + + vars_files: + - vars.yml + - aws_cloud_vars.yml + + vars: + keypair: copr-builder + instance_type: a1.xlarge + # We keep this around the on-demand price, as we don't want unnecessary + # interrupts. + spot_price: 0.102 + security_group: ssh-only + max_spawn_time: 1100 + spawning_vm_user: "fedora" + arch: aarch64 + image_name: "{{ builder_images[arch] }}" + instance_volumes: + - device_name: sdb + delete_on_termination: True + volume_type: gp2 + volume_size: 160 + + tasks: + - include: "spinup_aws_spot_task.yml" + + +- name: provision builder + hosts: builder_temp_group + gather_facts: false + become: true + user: fedora + + vars_files: + - vars.yml + - aws_cloud_vars.yml + + vars: + ansible_python_interpreter: /usr/bin/python3 + + tasks: + - include: "create_swap_file.yml" + when: + - prepare_base_image is defined + + - include: "provision_builder_tasks.yml" diff --git a/roles/copr/backend/files/provision/builderpb-aws-spot-x86_64.yml b/roles/copr/backend/files/provision/builderpb-aws-spot-x86_64.yml new file mode 100644 index 0000000000..d08aaa6fcd --- /dev/null +++ b/roles/copr/backend/files/provision/builderpb-aws-spot-x86_64.yml @@ -0,0 +1,47 @@ +--- +- name: create an x86_64 spot instance in aws + hosts: 127.0.0.1 + gather_facts: false + + roles: + - spawner + + vars_files: + - vars.yml + - aws_cloud_vars.yml + + vars: + keypair: copr-builder + instance_type: i3.large + # We keep this around the on-demand price, as we don't want unnecessary + # interrupts. + spot_price: 0.156 + security_group: ssh-only + max_spawn_time: 1100 + spawning_vm_user: "fedora" + arch: x86_64 + image_name: "{{ builder_images[arch] }}" + + tasks: + - include: "spinup_aws_spot_task.yml" + + +- name: provision builder + hosts: builder_temp_group + gather_facts: false + become: true + user: fedora + + vars_files: + - vars.yml + - aws_cloud_vars.yml + + vars: + ansible_python_interpreter: /usr/bin/python3 + + tasks: + - include: "create_swap_file.yml" + when: + - prepare_base_image is defined + + - include: "provision_builder_tasks.yml" diff --git a/roles/copr/backend/files/provision/files/mock/centos-stream-aarch64.cfg b/roles/copr/backend/files/provision/files/mock/centos-stream-aarch64.cfg deleted file mode 100644 index 81e52a64f2..0000000000 --- a/roles/copr/backend/files/provision/files/mock/centos-stream-aarch64.cfg +++ /dev/null @@ -1,5 +0,0 @@ -include('templates/centos-stream.tpl') - -config_opts['root'] = 'centos-stream-8-aarch64' -config_opts['target_arch'] = 'aarch64' -config_opts['legal_host_arches'] = ('aarch64',) diff --git a/roles/copr/backend/files/provision/files/mock/centos-stream-ppc64le.cfg b/roles/copr/backend/files/provision/files/mock/centos-stream-ppc64le.cfg deleted file mode 100644 index 7d9ea380fb..0000000000 --- a/roles/copr/backend/files/provision/files/mock/centos-stream-ppc64le.cfg +++ /dev/null @@ -1,5 +0,0 @@ -include('templates/centos-stream.tpl') - -config_opts['root'] = 'centos-stream-8-ppc64le' -config_opts['target_arch'] = 'ppc64le' -config_opts['legal_host_arches'] = ('ppc64le',) diff --git a/roles/copr/backend/files/provision/files/mock/centos-stream-x86_64.cfg b/roles/copr/backend/files/provision/files/mock/centos-stream-x86_64.cfg deleted file mode 100644 index 6d355b53ad..0000000000 --- a/roles/copr/backend/files/provision/files/mock/centos-stream-x86_64.cfg +++ /dev/null @@ -1,5 +0,0 @@ -include('templates/centos-stream.tpl') - -config_opts['root'] = 'centos-stream-8-x86_64' -config_opts['target_arch'] = 'x86_64' -config_opts['legal_host_arches'] = ('x86_64',) diff --git a/roles/copr/backend/files/provision/files/mock/fedora-32-armhfp.cfg b/roles/copr/backend/files/provision/files/mock/fedora-32-armhfp.cfg deleted file mode 100644 index 5b7454f9a8..0000000000 --- a/roles/copr/backend/files/provision/files/mock/fedora-32-armhfp.cfg +++ /dev/null @@ -1,8 +0,0 @@ -config_opts['releasever'] = '32' -config_opts['target_arch'] = 'armv7hl' -config_opts['legal_host_arches'] = ('armv7l', 'armv8l', 'aarch64') - -# https://bugzilla.redhat.com/show_bug.cgi?id=1895363 -config_opts['use_bootstrap'] = False - -include('templates/fedora-branched.tpl') diff --git a/roles/copr/backend/files/provision/files/mock/fedora-33-armhfp.cfg b/roles/copr/backend/files/provision/files/mock/fedora-33-armhfp.cfg deleted file mode 100644 index 1e2c20c373..0000000000 --- a/roles/copr/backend/files/provision/files/mock/fedora-33-armhfp.cfg +++ /dev/null @@ -1,8 +0,0 @@ -config_opts['releasever'] = '33' -config_opts['target_arch'] = 'armv7hl' -config_opts['legal_host_arches'] = ('armv7l', 'armv8l', 'aarch64') - -# https://bugzilla.redhat.com/show_bug.cgi?id=1895363 -config_opts['use_bootstrap'] = False - -include('templates/fedora-branched.tpl') diff --git a/roles/copr/backend/files/provision/files/mock/fedora-34-armhfp.cfg b/roles/copr/backend/files/provision/files/mock/fedora-34-armhfp.cfg deleted file mode 100644 index 775999c80c..0000000000 --- a/roles/copr/backend/files/provision/files/mock/fedora-34-armhfp.cfg +++ /dev/null @@ -1,7 +0,0 @@ -config_opts['target_arch'] = 'armv7hl' -config_opts['legal_host_arches'] = ('armv7l', 'armv8l', 'aarch64') - -# https://bugzilla.redhat.com/show_bug.cgi?id=1895363 -config_opts['use_bootstrap'] = False - -include('templates/fedora-rawhide.tpl') diff --git a/roles/copr/backend/files/provision/files/mock/fedora-rawhide-armhfp.cfg b/roles/copr/backend/files/provision/files/mock/fedora-rawhide-armhfp.cfg deleted file mode 100644 index 775999c80c..0000000000 --- a/roles/copr/backend/files/provision/files/mock/fedora-rawhide-armhfp.cfg +++ /dev/null @@ -1,7 +0,0 @@ -config_opts['target_arch'] = 'armv7hl' -config_opts['legal_host_arches'] = ('armv7l', 'armv8l', 'aarch64') - -# https://bugzilla.redhat.com/show_bug.cgi?id=1895363 -config_opts['use_bootstrap'] = False - -include('templates/fedora-rawhide.tpl') diff --git a/roles/copr/backend/files/provision/files/mock/templates/centos-stream.tpl b/roles/copr/backend/files/provision/files/mock/templates/centos-stream.tpl deleted file mode 100644 index ef39dd2f17..0000000000 --- a/roles/copr/backend/files/provision/files/mock/templates/centos-stream.tpl +++ /dev/null @@ -1,120 +0,0 @@ -config_opts['chroot_setup_cmd'] = 'install tar gcc-c++ redhat-rpm-config redhat-release which xz sed make bzip2 gzip gcc coreutils unzip shadow-utils diffutils cpio bash gawk rpm-build info patch util-linux findutils grep' -config_opts['dist'] = 'el8' # only useful for --resultdir variable subst -config_opts['releasever'] = '8' -config_opts['package_manager'] = 'dnf' -config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['bootstrap_image'] = 'registry.centos.org/centos:8' -config_opts['dnf_vars'] = { 'stream': '8-stream', - 'contentdir': 'centos', - } - -config_opts['dnf.conf'] = """ -[main] -keepcache=1 -debuglevel=2 -reposdir=/dev/null -logfile=/var/log/yum.log -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 -syslog_ident=mock -syslog_device= -mdpolicy=group:primary -best=1 -protected_packages= -module_platform_id=platform:el8 -user_agent={{ user_agent }} - -[Stream-BaseOS] -name=CentOS-Stream - Base -baseurl=http://mirror.centos.org/centos/8-stream/BaseOS/$basearch/os/ -failovermethod=priority -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official -gpgcheck=1 -skip_if_unavailable=False - -[Stream-AppStream] -name=CentOS-Stream - AppStream -baseurl=http://mirror.centos.org/centos/8-stream/AppStream/$basearch/os/ -gpgcheck=1 -enabled=1 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official - -[Stream-centosplus] -name=CentOS-Stream - Plus -baseurl=http://mirror.centos.org/centos/8-stream/centosplus/$basearch/os/ -gpgcheck=1 -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official - -[cr] -name=CentOS-$releasever - cr -baseurl=http://mirror.centos.org/centos/8/cr/$basearch/os/ -gpgcheck=1 -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official - -[Stream-base-debuginfo] -name=CentOS-Stream - Debuginfo -baseurl=http://debuginfo.centos.org/8-stream/$basearch/ -gpgcheck=1 -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official - -[Stream-extras] -name=CentOS-Stream - Extras -baseurl=http://mirror.centos.org/centos/8-stream/extras/$basearch/os/ -gpgcheck=1 -enabled=1 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official - -[Stream-PowerTools] -name=CentOS-Stream - PowerTools -baseurl=http://mirror.centos.org/centos/8-stream/PowerTools/$basearch/os/ -gpgcheck=1 -enabled=1 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official - -[Stream-Devel] -name=CentOS-Stream - Devel WARNING! FOR BUILDROOT USE ONLY! -baseurl=http://mirror.centos.org/centos/8-stream/Devel/$basearch/os/ -gpgcheck=1 -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official - -[Stream-BaseOS-source] -name=CentOS-Stream - BaseOS Sources -baseurl=http://vault.centos.org/centos/8-stream/BaseOS/Source/ -gpgcheck=1 -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official - -[Stream-AppStream-source] -name=CentOS-Stream - AppStream Sources -baseurl=http://vault.centos.org/centos/8-stream/AppStream/Source/ -gpgcheck=1 -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official - -[Stream-PowerTools-source] -name=CentOS-Stream - PowerTools Sources -baseurl=http://vault.centos.org/centos/8-stream/PowerTools/Source/ -gpgcheck=1 -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official - -[Stream-extras-source] -name=CentOS-Stream - Extras Sources -baseurl=http://vault.centos.org/centos/8-stream/extras/Source/ -gpgcheck=1 -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official - -[Stream-centosplus-source] -name=CentOS-Stream - Plus Sources -baseurl=http://vault.centos.org/centos/8-stream/centosplus/Source/ -gpgcheck=1 -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official -""" diff --git a/roles/copr/backend/files/provision/spinup_aws_spot_task.yml b/roles/copr/backend/files/provision/spinup_aws_spot_task.yml new file mode 100644 index 0000000000..18b0fdb993 --- /dev/null +++ b/roles/copr/backend/files/provision/spinup_aws_spot_task.yml @@ -0,0 +1,48 @@ +--- +- debug: msg="vm_name={{ vm_name }}" + +- name: random subnet to overcome datacenter failures + set_fact: subnet_id={{ item }} + with_random_choice: "{{ aws_arch_subnets[arch] }}" + +- name: Launch instance + ec2: + key_name: "{{ keypair }}" + group: "{{ security_group }}" + instance_type: "{{ instance_type }}" + image: "{{ image_name }}" + wait: true + region: "{{ aws_region }}" + # both x86_64 and aarch64 arches can be allocated in us-east-1c + vpc_subnet_id: "{{ subnet_id }}" + assign_public_ip: yes + instance_tags: + FedoraGroup: copr + CoprPurpose: builder + CoprInstance: "{% if devel %}devel{% else %}production{% endif %}" + Name: "{{ vm_name }}" + arch: "{{ arch }}" + aws_access_key: "{{ aws_access_key }}" + aws_secret_key: "{{ aws_secret_key }}" + volumes: "{% if instance_volumes is defined %}{{ instance_volumes }}{% else %}[]{% endif %}" + spot_price: "{{ spot_price }}" + instance_initiated_shutdown_behavior: terminate + register: ec2 + +- name: Add new instance to host group + add_host: + hostname: "{{ item.public_ip }}" + groupname: builder_temp_group + loop: "{{ ec2.instances }}" + +- set_fact: builder_ip={{ ec2.instances[0].public_ip }} + +- debug: msg="VM_IP={{ builder_ip }}" + +- name: wait for he host to be hot + local_action: wait_for host={{ builder_ip }} port=22 delay=1 timeout={{ max_spawn_time }} + +- name: wait until ssh is available + local_action: shell false; until [ "$?" -eq "0" ]; do sleep 2; ssh -o PasswordAuthentication=no {{ spawning_vm_user|default('fedora') }}@{{ builder_ip }} 'echo foobar' 2>/dev/null; done + async: 600 + poll: 2 diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml index 83b2387030..5915005e9f 100644 --- a/roles/copr/backend/tasks/main.yml +++ b/roles/copr/backend/tasks/main.yml @@ -162,6 +162,27 @@ # - library # tags: # - provision_config +# +- name: calculate the maximum resalloc workers per architecture + set_fact: "max_{{ item }}_workers={{ builders | community.general.json_query('*.'+item+'[0]') | sum() }}" + with_items: + - x86_64 + - aarch64 + tags: + - provision_config + +- name: calculate max number of workers + set_fact: "max_workers={{ max_x86_64_workers|int + max_aarch64_workers|int }}" + tags: + - provision_config + +- name: print max arch workers + debug: "var=max_{{ item }}_workers" + with_items: + - x86_64 + - aarch64 + tags: + - provision_config - name: resalloc import_tasks: resalloc.yml @@ -207,6 +228,7 @@ tags: - config - copr_infrastructure_password + - provision_config - name: create messaging config directory file: dest=/etc/copr/msgbuses state=directory owner=copr group=copr mode=0700 diff --git a/roles/copr/backend/tasks/resalloc.yml b/roles/copr/backend/tasks/resalloc.yml index d5e2fa63cc..6cc11910ab 100644 --- a/roles/copr/backend/tasks/resalloc.yml +++ b/roles/copr/backend/tasks/resalloc.yml @@ -61,7 +61,8 @@ - vm-aarch64-new - vm-aws-new - vm-aws-delete - - vm-aws-check + - vm-check + - vm-release tags: - provision_config diff --git a/roles/copr/backend/templates/copr-be.conf.j2 b/roles/copr/backend/templates/copr-be.conf.j2 index ba67a34907..9a06f2f3df 100644 --- a/roles/copr/backend/templates/copr-be.conf.j2 +++ b/roles/copr/backend/templates/copr-be.conf.j2 @@ -38,13 +38,20 @@ sleeptime=20 # This option basically controls the amount of RAM allocated for # processing builds on copr backend, and how many resalloc tickets can # be taken at the same time. -builds_max_workers={{ builders.aws.x86_64[0] + builders.aws.aarch64[0] + builders.aws.armhfp[0] }} +builds_max_workers={{ max_workers }} -# Maximum number of concurrently running tasks per architecture. +# Maximum number of concurrently running tasks per architecture. Since we +# emulate s390x and armhfp on x86_64, we give it ~25% of the x86_64 quota. +# The 32bit x86 variants (i386, i586 and i686) are in minority now, so let's +# limit them as well. builds_max_workers_arch= - x86_64={{ builders.aws.x86_64[0] }}, - aarch64={{ builders.aws.aarch64[0]}}, - armhfp={{ builders.aws.armhfp[0] }} + x86_64={{ max_x86_64_workers }}, + aarch64={{ max_aarch64_workers }}, + armhfp={{ (max_x86_64_workers|int / 4)|int }}, + s390x={{ (max_x86_64_workers|int / 4)|int }}, + i386={{ (max_x86_64_workers|int / 4)|int }}, + i586={{ (max_x86_64_workers|int / 4)|int }}, + i686={{ (max_x86_64_workers|int / 4)|int }} # Maximum number of concurrently running tasks per project owner. {% if env == 'production' %} diff --git a/roles/copr/backend/templates/provision/libvirt-new b/roles/copr/backend/templates/provision/libvirt-new index f17acd4a5e..91355d349c 100755 --- a/roles/copr/backend/templates/provision/libvirt-new +++ b/roles/copr/backend/templates/provision/libvirt-new @@ -391,8 +391,14 @@ def _main(): _arange_default("resalloc_pool_id", "RESALLOC_POOL_ID") _arange_default("resalloc_id_in_pool", "RESALLOC_ID_IN_POOL") + devel = True + if "prod" in args.name: + devel = False + + ip6_a, ip6_g = get_fedora_ipv6_address(args.resalloc_pool_id, - args.resalloc_id_in_pool) + args.resalloc_id_in_pool, + devel) spawner = LibvirtSpawner(args.resalloc_pool_id, log) spawner.vm_name = args.name diff --git a/roles/copr/backend/templates/resalloc/pools.yaml b/roles/copr/backend/templates/resalloc/pools.yaml index 36bf18f62f..af23fabee5 100644 --- a/roles/copr/backend/templates/resalloc/pools.yaml +++ b/roles/copr/backend/templates/resalloc/pools.yaml @@ -1,5 +1,5 @@ -{% macro aws_x86_64(max, max_starting, max_prealloc) %} -aws_x86_64_normal_{% if devel %}dev{% else %}prod{% endif %}: +{% macro aws_x86_64(max, max_starting, max_prealloc, spot=False) %} +aws_x86_64_{% if spot %}spot{% else %}normal{% endif %}_{% if devel %}dev{% else %}prod{% endif %}: max: {{ max }} max_starting: {{ max_starting }} max_prealloc: {{ max_prealloc }} @@ -17,17 +17,19 @@ aws_x86_64_normal_{% if devel %}dev{% else %}prod{% endif %}: - arch_armhfp_emulated - arch_s390x - arch_s390x_emulated - cmd_new: "/var/lib/resallocserver/resalloc_provision/vm-aws-new --arch=x86_64" + - aws + cmd_new: "/var/lib/resallocserver/resalloc_provision/vm-aws-new --arch=x86_64 {% if spot %}--spot{% endif %}" cmd_delete: "/var/lib/resallocserver/resalloc_provision/vm-aws-delete" - cmd_livecheck: "/var/lib/resallocserver/resalloc_provision/vm-aws-check" + cmd_livecheck: "/var/lib/resallocserver/resalloc_provision/vm-check" + cmd_release: "/var/lib/resallocserver/resalloc_provision/vm-release" livecheck_period: 180 reuse_opportunity_time: 180 reuse_max_count: 8 reuse_max_time: 1800 {% endmacro %} -{% macro aws_aarch64(max, max_starting, max_prealloc) %} -aws_aarch64_normal_{% if devel %}dev{% else %}prod{% endif %}: +{% macro aws_aarch64(max, max_starting, max_prealloc, spot=False) %} +aws_aarch64_{% if spot %}spot{% else %}normal{% endif %}_{% if devel %}dev{% else %}prod{% endif %}: max: {{ max }} max_starting: {{ max_starting }} max_prealloc: {{ max_prealloc }} @@ -35,9 +37,11 @@ aws_aarch64_normal_{% if devel %}dev{% else %}prod{% endif %}: - copr_builder - arch_aarch64 - arch_aarch64_native - cmd_new: "/var/lib/resallocserver/resalloc_provision/vm-aws-new --arch=aarch64" + - aws + cmd_new: "/var/lib/resallocserver/resalloc_provision/vm-aws-new --arch=aarch64 {% if spot %}--spot{% endif %}" cmd_delete: "/var/lib/resallocserver/resalloc_provision/vm-aws-delete" - cmd_livecheck: "/var/lib/resallocserver/resalloc_provision/vm-aws-check" + cmd_livecheck: "/var/lib/resallocserver/resalloc_provision/vm-check" + cmd_release: "/var/lib/resallocserver/resalloc_provision/vm-release" livecheck_period: 180 reuse_opportunity_time: 180 reuse_max_count: 8 @@ -45,12 +49,12 @@ aws_aarch64_normal_{% if devel %}dev{% else %}prod{% endif %}: {% endmacro %} # x86_64 hypervisors -{% if devel %} -{% for hv in ["02", "03", "04"] %} -copr_hv_x86_64_{{ hv }}: - max: 3 - max_starting: 2 - max_prealloc: 2 +{% for hv in ["01", "02", "03", "04"] %} +{% if "x86_hypervisor_" + hv in builders %} +copr_hv_x86_64_{{ hv }}_{% if devel %}dev{% else %}prod{% endif %}: + max: {{ builders["x86_hypervisor_" + hv]["x86_64"][0] }} + max_starting: {{ builders["x86_hypervisor_" + hv]["x86_64"][1] }} + max_prealloc: {{ builders["x86_hypervisor_" + hv]["x86_64"][2] }} tags: - copr_builder - arch_x86_64 @@ -65,16 +69,23 @@ copr_hv_x86_64_{{ hv }}: - arch_armhfp_emulated - arch_s390x - arch_s390x_emulated + - hypervisor + - hypervisor_{{ hv }} cmd_new: "/var/lib/resallocserver/provision/libvirt-new --swap-vol-size 168" cmd_delete: "/var/lib/resallocserver/provision/libvirt-new --swap-vol-size 168" cmd_delete: "/var/lib/resallocserver/provision/libvirt-delete" - cmd_livecheck: "echo TODO" + cmd_livecheck: "/var/lib/resallocserver/resalloc_provision/vm-check" + cmd_release: "/var/lib/resallocserver/resalloc_provision/vm-release" livecheck_period: 180 reuse_opportunity_time: 180 reuse_max_count: 8 reuse_max_time: 1800 -{% endfor %} +{% else %} +# +# x86_hypervisor_{{ hv }} not configured in group_vars +# {% endif %} +{% endfor %} {% macro hw_aarch64(id, inst, max, max_starting, max_prealloc) %} aarch64_{{ id }}_{{ inst }}: @@ -101,15 +112,20 @@ aarch64_{{ id }}_{{ inst }}: - arch_aarch64_native {% endmacro %} -{{ aws_x86_64(builders.aws.x86_64[0] + builders.aws.armhfp[0], - builders.aws.x86_64[1] + builders.aws.armhfp[1], - builders.aws.x86_64[2] + builders.aws.armhfp[2]) +{{ aws_x86_64(builders.aws.x86_64[0], builders.aws.x86_64[1], + builders.aws.x86_64[2]) }} -{{ aws_aarch64(builders.aws.aarch64[0], - builders.aws.aarch64[1], +{{ aws_aarch64(builders.aws.aarch64[0], builders.aws.aarch64[1], builders.aws.aarch64[2]) }} +{{ aws_x86_64(builders.aws_spot.x86_64[0], builders.aws_spot.x86_64[1], + builders.aws_spot.x86_64[2], True) +}} +{{ aws_aarch64(builders.aws_spot.aarch64[0], builders.aws_spot.aarch64[1], + builders.aws_spot.aarch64[2], True) +}} + {% if env == "production" %} {{ hw_aarch64("01", "prod", 4, 2, 4) }} {{ hw_aarch64("02", "prod", 4, 2, 4) }} diff --git a/roles/copr/backend/templates/resalloc/vm-aws-new b/roles/copr/backend/templates/resalloc/vm-aws-new index 3777a1a4f0..d8a1e88be5 100755 --- a/roles/copr/backend/templates/resalloc/vm-aws-new +++ b/roles/copr/backend/templates/resalloc/vm-aws-new @@ -15,6 +15,7 @@ Allocate AWS VM instance for Copr build system. Options: --arch native architecture (required) -h, --help show this help + --spot start a spot instance Environment variables: \$RESALLOC_NAME the name given to the allocated instance, will be @@ -31,11 +32,12 @@ test $# -eq 0 && show_help 1 test -n "$RESALLOC_NAME" || show_help 1 -ARGS=$(getopt -o "h" -l "arch:,help" -n "getopt" -- "$@") \ +ARGS=$(getopt -o "h" -l "arch:,spot,help" -n "getopt" -- "$@") \ || show_help 1 eval set -- "$ARGS" opt_arch= +opt_spot=false while true; do # now the name is in $1 and argument in $2 @@ -47,6 +49,13 @@ while true; do eval "opt_$opt=\$2" shift 2 ;; + --spot) + opt=${1##--} + opt=${opt##-} + opt=${opt//-/_} + eval "opt_$opt=:" + shift + ;; -h|--help) show_help 0;; --) # end! shift; break;; @@ -72,10 +81,15 @@ cleanup_actions() } trap cleanup_actions EXIT +spot_pb_part= +if $opt_spot; then + spot_pb_part=-spot +fi + # TODO: We should call aws-cli directly here, instead of parsing output of # ansible playbook. But at the time of writing this script we had the playbook # available, so parsing the output is the easiest way to start. -playbook=/var/lib/resallocserver/provision/builderpb-aws-"$opt_arch".yml +playbook=/var/lib/resallocserver/provision/builderpb-aws"$spot_pb_part"-"$opt_arch".yml { vm_ip=$(ansible-playbook "$playbook" \ diff --git a/roles/copr/backend/templates/resalloc/vm-aws-check b/roles/copr/backend/templates/resalloc/vm-check similarity index 100% rename from roles/copr/backend/templates/resalloc/vm-aws-check rename to roles/copr/backend/templates/resalloc/vm-check diff --git a/roles/copr/backend/templates/resalloc/vm-release b/roles/copr/backend/templates/resalloc/vm-release new file mode 100755 index 0000000000..9772ec1bf1 --- /dev/null +++ b/roles/copr/backend/templates/resalloc/vm-release @@ -0,0 +1,13 @@ +#! /bin/sh + +die() { echo "$*" >&2 ; exit 1; } + +set -x +set -e +test -n "$RESALLOC_NAME" +test -n "$RESALLOC_RESOURCE_DATA" + +# we only put IP out in spawning script, nothing else +set -- $(echo "$RESALLOC_RESOURCE_DATA" | base64 --decode) +IP=$1 +ssh -o ConnectTimeout=10 "root@$IP" copr-builder-cleanup diff --git a/roles/copr/dist_git/files/patches/git-python-pr-1254.patch b/roles/copr/dist_git/files/patches/git-python-pr-1254.patch new file mode 100644 index 0000000000..d65b90ca7f --- /dev/null +++ b/roles/copr/dist_git/files/patches/git-python-pr-1254.patch @@ -0,0 +1,44 @@ +commit 1a04c15b1f77f908b1dd3983a27ee49c41b3a3e5 +Author: Todd Zullinger +AuthorDate: Mon May 24 17:34:42 2021 -0400 +Commit: Todd Zullinger +CommitDate: Tue May 25 11:42:07 2021 -0400 + + improve index mode for files with executable bit + + The fix for #430 in bebc4f56 (Use correct mode for executable files, + 2016-05-19) is incomplete. It fails (in most cases) when files have + modes which are not exactly 0644 or 0755. + + Git only cares whether the executable bit is set (or not). Ensure the + mode we set for the index is either 100644 or 100755 based on whether + the executable bit is set for the file owner. Do this similarly to how + upstream git does it in cache.h¹. + + Add a test covering various file modes to help catch regressions. + + Fixes #1253 + + ¹ https://github.com/git/git/blob/v2.31.1/cache.h#L247 + +diff --git a/git/index/fun.py b/git/index/fun.py +index f40928c3..1012f480 100644 +--- a/git/index/fun.py ++++ b/git/index/fun.py +@@ -11,6 +11,7 @@ from stat import ( + S_ISDIR, + S_IFMT, + S_IFREG, ++ S_IXUSR, + ) + import subprocess + +@@ -115,7 +116,7 @@ def stat_mode_to_index_mode(mode): + return S_IFLNK + if S_ISDIR(mode) or S_IFMT(mode) == S_IFGITLINK: # submodules + return S_IFGITLINK +- return S_IFREG | 0o644 | (mode & 0o111) # blobs with or without executable bit ++ return S_IFREG | (mode & S_IXUSR and 0o755 or 0o644) # blobs with or without executable bit + + + def write_cache(entries: Sequence[Union[BaseIndexEntry, 'IndexEntry']], stream: IO[bytes], diff --git a/roles/copr/dist_git/tasks/main.yml b/roles/copr/dist_git/tasks/main.yml index 216e5334a0..5720a3af7f 100644 --- a/roles/copr/dist_git/tasks/main.yml +++ b/roles/copr/dist_git/tasks/main.yml @@ -28,6 +28,11 @@ - dist-git-selinux - copr-dist-git +- name: Patch GitPython to import Thunderbird (issue 1700) + patch: src=patches/git-python-pr-1254.patch + dest=/usr/lib/python3.9/site-packages/git/index/fun.py + tags: patches + - name: switch selinux to enforcing selinux: policy=targeted state=enforcing diff --git a/roles/copr/frontend-cloud/templates/copr.conf b/roles/copr/frontend-cloud/templates/copr.conf index a51359b1ea..8c7e359a5e 100644 --- a/roles/copr/frontend-cloud/templates/copr.conf +++ b/roles/copr/frontend-cloud/templates/copr.conf @@ -24,6 +24,8 @@ BACKEND_PASSWORD = '{{ copr_backend_password_stg }}' BACKEND_BASE_URL = '{{ backend_base_url }}' +BACKEND_STATS_URI = "/stats/index.html" + # restrict access to a set of users #USE_ALLOWED_USERS = False #ALLOWED_USERS = ['bonnie', 'clyde'] diff --git a/roles/dhcp_server/files/dhcpd.conf.cloud-noc-os01.rdu-cc.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.cloud-noc-os01.rdu-cc.fedoraproject.org index f44998b9ad..1e945509ec 100644 --- a/roles/dhcp_server/files/dhcpd.conf.cloud-noc-os01.rdu-cc.fedoraproject.org +++ b/roles/dhcp_server/files/dhcpd.conf.cloud-noc-os01.rdu-cc.fedoraproject.org @@ -13,4 +13,12 @@ shared-network mgmt { option routers 172.23.1.254; range 172.23.1.100 172.23.1.249; } + subnet 172.23.5.0 netmask 255.255.255.0 { + allow booting; + allow bootp; + authoritative; + + option routers 172.23.5.254; + range 172.23.5.100 172.23.5.249; + } } diff --git a/roles/dns/files/zones.conf b/roles/dns/files/zones.conf index b39a275c9d..3119c5b074 100644 --- a/roles/dns/files/zones.conf +++ b/roles/dns/files/zones.conf @@ -392,6 +392,11 @@ zone "fedoraplayground.com" { file "/var/named/master/built/fedoraplayground.com"; }; +zone "fedoraloveskde.org" { + type master; + file "/var/named/master/built/fedoraloveskde.org"; +}; + zone "1.0.0.3.0.9.0.3.8.2.0.0.0.1.6.2.ip6.arpa" { type master; file "/var/named/master/built/1.0.0.3.0.9.0.3.8.2.0.0.0.1.6.2.ip6.arpa"; diff --git a/roles/download/files/httpd/dl.fedoraproject.org/secondary.conf b/roles/download/files/httpd/dl.fedoraproject.org/secondary.conf index be85ad32d8..7f0f3695ae 100644 --- a/roles/download/files/httpd/dl.fedoraproject.org/secondary.conf +++ b/roles/download/files/httpd/dl.fedoraproject.org/secondary.conf @@ -1,5 +1,5 @@ Alias /pub /srv/pub -Alias /odcs /srv/odcs +Alias /odcs /mnt/odcs DocumentRoot /srv/web @@ -18,7 +18,7 @@ DocumentRoot /srv/web - + HeaderName /HEADER.html ReadmeName /FOOTER.html Options Indexes FollowSymLinks diff --git a/roles/download/tasks/main.yml b/roles/download/tasks/main.yml index bb6925cd24..fa3686906d 100644 --- a/roles/download/tasks/main.yml +++ b/roles/download/tasks/main.yml @@ -14,10 +14,6 @@ - name: Create /srv/web directory file: path=/srv/web state=directory -## This is used by internal systems to get beta content -- name: Create /mnt/koji/compose directory - file: path=/mnt/koji/compose state=directory - - name: Set httpd_use_nfs seboolean seboolean: name=httpd_use_nfs state=yes persistent=yes diff --git a/roles/fasjson/files/aliases.static b/roles/fasjson/files/aliases.static index 368d206772..d52ea39056 100644 --- a/roles/fasjson/files/aliases.static +++ b/roles/fasjson/files/aliases.static @@ -174,6 +174,9 @@ program-manager: fpgm diversity: fpl,fcaic,siddharthvipul1 diversity-inclusion: diversity +# Fedora Matrix admin +matrixadmin: mattdm,riecatnor,kevin,nb + # FESCo fesco-chair: kevin fesco: fesco@lists.fedoraproject.org @@ -215,7 +218,7 @@ secalert: security-private@lists.fedoraproject.org infra-security: puiterwijk,kevin,smooge,codeblock,mobrien webmaster: websites@lists.fedoraproject.org -logo: rlerch@redhat.com,duffy@redhat.com +logo: rlerch@redhat.com,duffy@redhat.com,mpeck@redhat.com ham-radio-exams: nb,jbwillia podcast: x3mboy,computerkid,riecatnor diff --git a/roles/fedmsg/irc/templates/ircbot.py b/roles/fedmsg/irc/templates/ircbot.py index 2f718330e1..0205d0d8b2 100644 --- a/roles/fedmsg/irc/templates/ircbot.py +++ b/roles/fedmsg/irc/templates/ircbot.py @@ -1,7 +1,7 @@ config = dict( irc=[ dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -34,7 +34,7 @@ config = dict( # For fedora-admin dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -57,7 +57,7 @@ config = dict( # For fedora-apps dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -80,7 +80,7 @@ config = dict( # For that commops crew! dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -99,7 +99,7 @@ config = dict( ), # A second bot for that commops crew that watches for the term "commops" dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -120,7 +120,7 @@ config = dict( # The planet is currently no longer sending messages # # A third one to listen for new Community Blog posts # dict( - # network='chat.freenode.net', + # network='irc.libera.chat', # port=6667, # make_pretty=True, # make_terse=True, @@ -139,7 +139,7 @@ config = dict( # ), # ), # dict( - # network='chat.freenode.net', + # network='irc.libera.chat', # port=6667, # make_pretty=True, # make_terse=True, @@ -159,7 +159,7 @@ config = dict( # For that python3 porting fad. AMAZING! dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -183,7 +183,7 @@ config = dict( # We no longer run askbot # # Just for the Ask Fedora crew in #fedora-ask # dict( - # network='chat.freenode.net', + # network='irc.libera.chat', # port=6667, # make_pretty=True, # make_terse=True, @@ -202,7 +202,7 @@ config = dict( # Show only compose msgs to the releng crew. dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -226,7 +226,7 @@ config = dict( # We no longer run trac # # The proyectofedora crew wants trac messages. # dict( - # network='chat.freenode.net', + # network='irc.libera.chat', # port=6667, # make_pretty=True, # make_terse=True, @@ -245,7 +245,7 @@ config = dict( # Similarly for #fedora-latam. dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -264,7 +264,7 @@ config = dict( # And for #fedora-g11n dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -287,7 +287,7 @@ config = dict( # And #ipsilon {% if env == "production" %} dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -306,7 +306,7 @@ config = dict( # For pagure dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -330,7 +330,7 @@ config = dict( # Hook up the design-team {% if env == "production" %} dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -350,7 +350,7 @@ config = dict( # And #fedora-docs wants in on the action dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -369,7 +369,7 @@ config = dict( # And #fedora-websites dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -391,7 +391,7 @@ config = dict( # And #fedora-mktg dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -413,7 +413,7 @@ config = dict( # And #fedora-modularity-bots dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -439,7 +439,7 @@ config = dict( # And #fedora-diversity dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -464,7 +464,7 @@ config = dict( # And #fedora-magazine dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -488,7 +488,7 @@ config = dict( # And #fedora-rust dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -511,7 +511,7 @@ config = dict( # And #rit-foss dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -534,7 +534,7 @@ config = dict( # For #fedora-workstation dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -557,7 +557,7 @@ config = dict( # For #koji dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -579,7 +579,7 @@ config = dict( # For #fedora-join dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -601,7 +601,7 @@ config = dict( # For #fedora-neuro dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -623,7 +623,7 @@ config = dict( # Hook up #fedora-badges with badges messages dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -644,7 +644,7 @@ config = dict( # channel #centos-ci with centos-infra messages dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, @@ -665,7 +665,7 @@ config = dict( # And #fedora-podcast dict( - network='chat.freenode.net', + network='irc.libera.chat', port=6667, make_pretty=True, make_terse=True, diff --git a/roles/fedora-web/build/files/syncStatic.sh b/roles/fedora-web/build/files/syncStatic.sh index 52a6c93830..cbcff014dc 100644 --- a/roles/fedora-web/build/files/syncStatic.sh +++ b/roles/fedora-web/build/files/syncStatic.sh @@ -7,6 +7,7 @@ function build { err=$( { cd "$site" && \ + make pullpos && \ make && \ rsync -qa --delete-after --delay-updates out/ "/srv/web/$site/"; \ } 2>&1 diff --git a/roles/fedora-web/build/files/syncStatic.stg.sh b/roles/fedora-web/build/files/syncStatic.stg.sh index 6043243345..53bb2ad999 100644 --- a/roles/fedora-web/build/files/syncStatic.stg.sh +++ b/roles/fedora-web/build/files/syncStatic.stg.sh @@ -7,6 +7,7 @@ function build { err=$( { cd "$site" && \ + make pullpos && \ make && \ rsync -qa --delete-after --delay-updates out/ "/srv/web/$site/"; \ } 2>&1 diff --git a/roles/fedora-web/build/tasks/main.yml b/roles/fedora-web/build/tasks/main.yml index 239c59b614..bf4ff9135e 100644 --- a/roles/fedora-web/build/tasks/main.yml +++ b/roles/fedora-web/build/tasks/main.yml @@ -7,6 +7,7 @@ - python-feedparser - python-genshi - python-setuptools + - langtable-python tags: - packages - fedora-web diff --git a/roles/fedora-web/translation/tasks/main.yml b/roles/fedora-web/translation/tasks/main.yml index 0c3a408812..aa217efda8 100644 --- a/roles/fedora-web/translation/tasks/main.yml +++ b/roles/fedora-web/translation/tasks/main.yml @@ -21,6 +21,21 @@ debug: var: user_result.ssh_public_key +- name: Create gitconfig for user + copy: + content: | + [user] + name = ♪ I'm a bot, bot, bot ♪ + email = _update_web_trans@sundries + [push] + default = simple + dest: ~_update_web_trans/.gitconfig + owner: _update_web_trans + group: _update_web_trans + mode: 0644 + tags: + - fedora-web-translation + - copy: src: ssh_config dest: ~_update_web_trans/.ssh/config diff --git a/roles/fedoraloveskde/build/files/syncfedoraloveskde.cron b/roles/fedoraloveskde/build/files/syncfedoraloveskde.cron new file mode 100644 index 0000000000..479ff818b4 --- /dev/null +++ b/roles/fedoraloveskde/build/files/syncfedoraloveskde.cron @@ -0,0 +1,2 @@ +MAILTO=web-members@fedoraproject.org +25 * * * * apache /usr/local/bin/lock-wrapper syncfedoraloveskde /usr/local/bin/syncfedoraloveskde diff --git a/roles/fedoraloveskde/build/files/syncfedoraloveskde.sh b/roles/fedoraloveskde/build/files/syncfedoraloveskde.sh new file mode 100644 index 0000000000..7d8a065319 --- /dev/null +++ b/roles/fedoraloveskde/build/files/syncfedoraloveskde.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +if [ ! -d /srv/web/fedoraloveskde.org/.git ] +then + /usr/bin/git clone -q https://pagure.io/fedora-kde/fedoraloveskde.org /srv/web/fedoraloveskde.org +fi + +cd /srv/web/fedoraloveskde.org + +/usr/bin/git clean -q -fdx || exit 1 +/usr/bin/git reset -q --hard || exit 1 +/usr/bin/git checkout -q production || exit 1 +/usr/bin/git pull -q --ff-only || exit 1 diff --git a/roles/fedoraloveskde/build/files/syncfedoraloveskde.stg.sh b/roles/fedoraloveskde/build/files/syncfedoraloveskde.stg.sh new file mode 100644 index 0000000000..dda344add3 --- /dev/null +++ b/roles/fedoraloveskde/build/files/syncfedoraloveskde.stg.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +if [ ! -d /srv/web/fedoraloveskde.org/.git ] +then + /usr/bin/git clone -q https://pagure.io/fedora-kde/fedoraloveskde.org /srv/web/fedoraloveskde.org +fi + +cd /srv/web/fedoraloveskde.org + +/usr/bin/git clean -q -fdx || exit 1 +/usr/bin/git reset -q --hard || exit 1 +/usr/bin/git checkout -q staging || exit 1 +/usr/bin/git pull -q --ff-only || exit 1 diff --git a/roles/fedoraloveskde/build/tasks/main.yml b/roles/fedoraloveskde/build/tasks/main.yml new file mode 100644 index 0000000000..aa7c2539b3 --- /dev/null +++ b/roles/fedoraloveskde/build/tasks/main.yml @@ -0,0 +1,35 @@ +- name: Create directories + file: state=directory + path=/srv/web/{{item}} + owner=apache group=apache mode=0755 + setype=httpd_sys_content_t seuser=system_u + with_items: + - fedoraloveskde.org + tags: + - fedoraloveskde + +- name: Copy syncfedoraloveskde script (stg) + when: env == "staging" + copy: > + src=syncfedoraloveskde.stg.sh dest=/usr/local/bin/syncfedoraloveskde owner=root group=root + mode=0755 + tags: + - fedoraloveskde + +- name: Copy syncfedoraloveskde script (prod) + when: env == "production" + copy: > + src=syncfedoraloveskde.sh dest=/usr/local/bin/syncfedoraloveskde owner=root group=root + mode=0755 + tags: + - fedoraloveskde + +- name: Install the syncfedoraloveskde cron job + copy: > + src={{item}}.cron dest=/etc/cron.d/{{item}}.cron + owner=root group=root mode=0644 + with_items: + - syncfedoraloveskde + tags: + - fedoraloveskde + - cron diff --git a/roles/fedoraloveskde/website/files/cron-sync-fedoraloveskde b/roles/fedoraloveskde/website/files/cron-sync-fedoraloveskde new file mode 100644 index 0000000000..7641c246a8 --- /dev/null +++ b/roles/fedoraloveskde/website/files/cron-sync-fedoraloveskde @@ -0,0 +1 @@ +30 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group --delete-excluded --exclude='.git*' sundries01::fedoraloveskde.org/ /srv/web/fedoraloveskde.org/ diff --git a/roles/fedoraloveskde/website/files/fedoraloveskde.conf b/roles/fedoraloveskde/website/files/fedoraloveskde.conf new file mode 100644 index 0000000000..e6d9a5e344 --- /dev/null +++ b/roles/fedoraloveskde/website/files/fedoraloveskde.conf @@ -0,0 +1,10 @@ +DocumentRoot /srv/web/fedoraloveskde.org/public + +AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css application/x-javascript + +FileETag MTime Size + +ExpiresActive On +ExpiresDefault "access plus 30 minutes" + +ProxyPass "/.well-known/acme-challenge" "http://certgetter01/.well-known/acme-challenge" diff --git a/roles/fedoraloveskde/website/tasks/main.yml b/roles/fedoraloveskde/website/tasks/main.yml new file mode 100644 index 0000000000..5a1317431d --- /dev/null +++ b/roles/fedoraloveskde/website/tasks/main.yml @@ -0,0 +1,15 @@ +- name: Copy in the sync-fedoraloveskde cronjob + copy: src=cron-sync-fedoraloveskde dest=/etc/cron.d/sync-fedoraloveskde + tags: + - fedoraloveskde + +- name: Copy some config files for {{website}} + copy: > + src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}} + owner=root group=root mode=0644 + with_items: + - fedoraloveskde.conf + notify: + - reload proxyhttpd + tags: + - fedoraloveskde diff --git a/roles/grobisplitter/files/splitter.py b/roles/grobisplitter/files/splitter.py index d14cd1be39..f1159c1f16 100755 --- a/roles/grobisplitter/files/splitter.py +++ b/roles/grobisplitter/files/splitter.py @@ -7,6 +7,7 @@ import shutil import gi import gzip import librepo +import lzma import hawkey import tempfile import os @@ -104,7 +105,15 @@ def _parse_repository_modular(repo_info,package_sack): """ cts = {} idx = mmd.ModuleIndex() - with gzip.GzipFile(filename=repo_info['modules'], mode='r') as gzf: + myfile = repo_info['modules'] + if myfile.endswith(".gz"): + openfunc=gzip.GzipFile + elif myfile.endswith(".xz"): + openfunc=lzma.LZMAFile + else: + print("This file type is not fixed in this hack. Please fix code. (2021-05-20)"); + sys.exit(1) + with openfunc(filename=myfile, mode='r') as gzf: mmdcts = gzf.read().decode('utf-8') res, failures = idx.update_from_string(mmdcts, True) if len(failures) != 0: @@ -190,7 +199,15 @@ def get_default_modules(directory): if 'modules' not in repo_info: return contents idx = mmd.ModuleIndex() - with gzip.GzipFile(filename=repo_info['modules'], mode='r') as gzf: + myfile=repo_info['modules'] + if myfile.endswith(".gz"): + openfunc=gzip.GzipFile + elif myfile.endswith(".xz"): + openfunc=lzma.LZMAFile + else: + print("This file type is not fixed in this hack. Please fix code. (2021-05-20)"); + sys.exit(1) + with openfunc(filename=myfile, mode='r') as gzf: mmdcts = gzf.read().decode('utf-8') res, failures = idx.update_from_string(mmdcts, True) if len(failures) != 0: diff --git a/roles/haproxy/files/503.http b/roles/haproxy/files/503.http index 2a49026658..ffb0f1e9a9 100644 --- a/roles/haproxy/files/503.http +++ b/roles/haproxy/files/503.http @@ -1,5 +1,5 @@ HTTP/1.1 503 Service Temporarily Unavailable -Content-Length: 3552 +Content-Length: 3349 Connection: close Cache-Control: no-cache Pragma: no-cache @@ -54,10 +54,8 @@ Content-Type: text/html; charset=UTF-8

Sorry! This service is currently unavailable.

The service that you are trying to access is currently unavailable. Please try refreshing this page in a couple of minutes. If you still see this message, then please follow the steps below:

    -
  1. Check on the status page if there are any known outages for our services.
    2. -
  2. Check the fedora-infrastructure pagure instance for an outage notification.
    3. -
  3. Ask around in #fedora-admin on irc.freenode.net.
    4. -
  4. If it is accessible, check the Outage SOP for more information.
    5. +
  5. Check on the status page if there are any known outages for our services.
    6. +
  6. If it is accessible, please check the how to work with our team document for more information.
diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index 4f7882868d..a59e0f9c03 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -94,16 +94,6 @@ backend freemedia-backend #{% endif %} # option httpchk GET /packages/_heartbeat -frontend totpcgiprovision-frontend - bind 0.0.0.0:10019 - default_backend totpcgiprovision-backend - -backend totpcgiprovision-backend - balance hdr(appserver) - http-check expect status 401 - server fas01 fas01:8444 check inter 5s rise 1 fall 2 - option httpchk GET /index.cgi - frontend blockerbugs-frontend bind 0.0.0.0:10022 default_backend blockerbugs-backend @@ -285,31 +275,10 @@ backend ipa-backend server ipa01 ipa01:443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/ipa.pem {% if env != "staging" %} server ipa02 ipa02:443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/ipa.pem backup + server ipa03 ipa03:443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/ipa.pem backup {% endif %} option httpchk GET /ipa/ui/ -# This is for TOTPCGI (legacy 2fa). It goes to the Openshift routers, which then passthrough TLS to the totpcgi pods -frontend totp-frontend - mode tcp - bind 0.0.0.0:8443 - default_backend totp-backend - -backend totp-backend - mode tcp - option tcplog - balance roundrobin - maxconn 16384 - timeout queue 5000 - timeout server 86400000 - timeout connect 86400000 - server os-node01 os-node01:443 weight 1 maxconn 16384 - server os-node02 os-node02:443 weight 1 maxconn 16384 - server os-node03 os-node03:443 weight 1 maxconn 16384 - server os-node04 os-node04:443 weight 1 maxconn 16384 -{% if env == "production" %} - server os-node05 os-node05:443 weight 1 maxconn 16384 -{% endif %} - frontend krb5-frontend mode tcp bind 0.0.0.0:1088 @@ -326,6 +295,7 @@ backend krb5-backend server ipa01 ipa01:88 weight 1 maxconn 16384 {% if env == "production" %} server ipa02 ipa02:88 weight 1 maxconn 16384 + server ipa03 ipa03:88 weight 1 maxconn 16384 {% endif %} frontend oci-candidate-registry-frontend diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.debuginfod.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.debuginfod.conf index 8093cd40bc..0300d06b29 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.debuginfod.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.debuginfod.conf @@ -1,15 +1,17 @@ -# Broadly reverse-proxy -ProxyPassMatch "^/(.*)$" "{{proxyurl}}/$1" {{proxyopts}} +# Reverse-proxy /buildid/* queries +ProxyPassMatch "^/buildid/(.*)$" "{{proxyurl}}/buildid/$1" {{proxyopts}} + +# Reverse-proxy /metrics - without (...) grouping op, URL just gets copied +ProxyPassMatch "^/metrics$" "{{proxyurl}}" {{proxyopts}} + ProxyPassReverse / {{proxyurl}}/ # ... but not the top level, which is instead redirected ProxyPass / ! -# ... configure this redirect in playbooks/include/proxies-redirects.yml -# Redirect permanent / https://fedoraproject.org/wiki/Debuginfod -# (or e.g.,) -# Redirect permanent / https://sourceware.org/elfutils/Debuginfod.html +# Redirect / URL over to wiki +Redirect permanent / https://fedoraproject.org/wiki/Debuginfod # test it with: # diff --git a/roles/ipa/client/files/fedora-nss-ignore.conf b/roles/ipa/client/files/fedora-nss-ignore.conf deleted file mode 100644 index d1b5e0ce17..0000000000 --- a/roles/ipa/client/files/fedora-nss-ignore.conf +++ /dev/null @@ -1,6 +0,0 @@ -## This file contains users who are in ipa to stop people from -## creating restricted accounts but we want to make sure the id in -## /etc/passwd and /etc/group are used. -[nss] -filter_users = root,bin,daemon,adm,lp,sync,shutdown,halt,mail,operator,games,ftp,nobody,avahi-autoipd,dbus,polkitd,rpc,tss,ntp,rpcuser,nfsnobody,postfix,sshd,nagios,nrpe,openvpn,,chrony,sssd,named,mock,apache -filter_groups = root,bin,daemon,sys,adm,tty,disk,lp,mem,kmem,wheel,cdrom,mail,man,dialout,floppy,games,tape,video,ftp,lock,audio,nobody,users,utmp,utempter,avahi-autoipd,ssh_keys,systemd-journal,dbus,rpc,tss,ntp,dip,rpcuser,nfsnobody,postdrop,postfix,sshd,screen,nagios,nrpe,openvpn,input,systemd-bus-proxy,systemd-network,cgred,chrony,printadmin,sssd,named,mock,apache diff --git a/roles/ipa/client/files/fedora-nss-ignore.conf.people b/roles/ipa/client/files/fedora-nss-ignore.conf.people deleted file mode 100644 index d6ef610c3f..0000000000 --- a/roles/ipa/client/files/fedora-nss-ignore.conf.people +++ /dev/null @@ -1,6 +0,0 @@ -## This file contains users who are in ipa to stop people from -## creating restricted accounts but we want to make sure the id in -## /etc/passwd and /etc/group are used. -[nss] -filter_users = root,bin,daemon,adm,lp,sync,shutdown,halt,mail,operator,games,ftp,nobody,avahi-autoipd,dbus,polkitd,rpc,tss,ntp,rpcuser,nfsnobody,postfix,sshd,nagios,nrpe,openvpn,,chrony,sssd,named,apache -filter_groups = root,bin,daemon,sys,adm,tty,disk,lp,mem,kmem,wheel,cdrom,mail,man,dialout,floppy,games,tape,video,ftp,lock,audio,nobody,users,utmp,utempter,avahi-autoipd,ssh_keys,systemd-journal,dbus,rpc,tss,ntp,dip,rpcuser,nfsnobody,postdrop,postfix,sshd,screen,nagios,nrpe,openvpn,input,systemd-bus-proxy,systemd-network,cgred,chrony,printadmin,sssd,named,apache diff --git a/roles/ipa/client/files/fedora-nss-ignore.conf.staging b/roles/ipa/client/files/fedora-nss-ignore.conf.staging deleted file mode 100644 index d0d0023615..0000000000 --- a/roles/ipa/client/files/fedora-nss-ignore.conf.staging +++ /dev/null @@ -1,6 +0,0 @@ -## This file contains users who are in ipa to stop people from -## creating restricted accounts but we want to make sure the id in -## /etc/passwd and /etc/group are used. -[nss] -filter_users = root,bin,daemon,adm,lp,sync,shutdown,halt,mail,operator,games,ftp,nobody,avahi-autoipd,dbus,polkitd,rpc,tss,ntp,rpcuser,nfsnobody,postfix,sshd,nagios,nrpe,openvpn,,chrony,sssd,named,mock -filter_groups = root,bin,daemon,sys,adm,tty,disk,lp,mem,kmem,wheel,cdrom,mail,man,dialout,floppy,games,tape,video,ftp,lock,audio,nobody,users,utmp,utempter,avahi-autoipd,ssh_keys,systemd-journal,dbus,rpc,tss,ntp,dip,rpcuser,nfsnobody,postdrop,postfix,sshd,screen,nagios,nrpe,openvpn,input,systemd-bus-proxy,systemd-network,cgred,chrony,printadmin,sssd,named,mock diff --git a/roles/ipa/client/tasks/main.yml b/roles/ipa/client/tasks/main.yml index 3b9af8cec0..aac107c33b 100644 --- a/roles/ipa/client/tasks/main.yml +++ b/roles/ipa/client/tasks/main.yml @@ -72,31 +72,12 @@ run_once: yes - name: Ensure that nss knows to skip certain users - copy: src=fedora-nss-ignore.conf dest=/etc/sssd/conf.d/ mode=600 owner=root group=root + template: src=fedora-nss-ignore.conf.j2 dest=/etc/sssd/conf.d/fedora-nss-ignore.conf mode=600 owner=root group=root tags: - ipa/client - config notify: - restart sssd - clean sss caches - when: env == "production" and inventory_hostname != 'people02.fedoraproject.org' -- name: Ensure that nss knows to skip certain users (on people02) - copy: src=fedora-nss-ignore.conf.people dest=/etc/sssd/conf.d/ mode=600 owner=root group=root - tags: - - ipa/client - - config - notify: - - restart sssd - - clean sss caches - when: env == "production" and inventory_hostname == 'people02.fedoraproject.org' - -- name: Ensure that nss knows to skip certain users - copy: src=fedora-nss-ignore.conf.staging dest=/etc/sssd/conf.d/fedora-nss-ignore.conf mode=600 owner=root group=root - tags: - - ipa/client - - config - notify: - - restart sssd - - clean sss caches - when: env == "staging" +- meta: flush_handlers diff --git a/roles/ipa/client/templates/fedora-nss-ignore.conf.j2 b/roles/ipa/client/templates/fedora-nss-ignore.conf.j2 new file mode 100644 index 0000000000..1e4351d6cf --- /dev/null +++ b/roles/ipa/client/templates/fedora-nss-ignore.conf.j2 @@ -0,0 +1,18 @@ +# There are a bunch of users we want to prefer the local version instead of the ipa/ldap version. +# But in at least one case, there is a real user ('mock') that we want to exclude on most machines, +# but not on people and ipsilon to allow them access to their people space and be able to login to things. +{% if inventory_hostname in groups['people'] or inventory_hostname in groups['ipsilon'] or inventory_hostname in groups['ipsilon_stg'] %} +## This file contains users who are in ipa to stop people from +## creating restricted accounts but we want to make sure the id in +## /etc/passwd and /etc/group are used. +[nss] +filter_users = root,bin,daemon,adm,lp,sync,shutdown,halt,mail,operator,games,ftp,nobody,avahi-autoipd,dbus,polkitd,rpc,tss,ntp,rpcuser,nfsnobody,postfix,sshd,nagios,nrpe,openvpn,,chrony,sssd,named,apache,blockerbugs +filter_groups = root,bin,daemon,sys,adm,tty,disk,lp,mem,kmem,wheel,cdrom,mail,man,dialout,floppy,games,tape,video,ftp,lock,audio,nobody,users,utmp,utempter,avahi-autoipd,ssh_keys,systemd-journal,dbus,rpc,tss,ntp,dip,rpcuser,nfsnobody,postdrop,postfix,sshd,screen,nagios,nrpe,openvpn,input,systemd-bus-proxy,systemd-network,cgred,chrony,printadmin,sssd,named,apache,blockerbugs +{% else %} +## This file contains users who are in ipa to stop people from +## creating restricted accounts but we want to make sure the id in +## /etc/passwd and /etc/group are used. +[nss] +filter_users = root,bin,daemon,adm,lp,sync,shutdown,halt,mail,operator,games,ftp,nobody,avahi-autoipd,dbus,polkitd,rpc,tss,ntp,rpcuser,nfsnobody,postfix,sshd,nagios,nrpe,openvpn,,chrony,sssd,named,mock,apache,bodhi,ftpsync,blockerbugs +filter_groups = root,bin,daemon,sys,adm,tty,disk,lp,mem,kmem,wheel,cdrom,mail,man,dialout,floppy,games,tape,video,ftp,lock,audio,nobody,users,utmp,utempter,avahi-autoipd,ssh_keys,systemd-journal,dbus,rpc,tss,ntp,dip,rpcuser,nfsnobody,postdrop,postfix,sshd,screen,nagios,nrpe,openvpn,input,systemd-bus-proxy,systemd-network,cgred,chrony,printadmin,sssd,named,mock,apache,blockerbugs +{% endif %} diff --git a/roles/ipsilon/templates/httpd.conf.j2 b/roles/ipsilon/templates/httpd.conf.j2 index cb034e7de5..0c00bbe877 100644 --- a/roles/ipsilon/templates/httpd.conf.j2 +++ b/roles/ipsilon/templates/httpd.conf.j2 @@ -10,13 +10,13 @@ Redirect /.well-known/webfinger /webfinger RewriteEngine on RewriteMap lowercase int:tolower {% if env == "staging" %} -RewriteCond ${lowercase:%{SERVER_NAME}} ^[a-z0-9_-]+\.id\.stg\.fedoraproject\.org$ +RewriteCond ${lowercase:%{SERVER_NAME}} ^[a-z0-9_\.-]+\.id\.stg\.fedoraproject\.org$ RewriteRule ^(.+) ${lowercase:%{SERVER_NAME}}$1 [C] -RewriteRule ^([a-z0-9_-]+)\.id\.stg\.fedoraproject\.org/.* /openid/id/$1/ [PT] +RewriteRule ^([a-z0-9_\.-]+)\.id\.stg\.fedoraproject\.org/.* /openid/id/$1/ [PT] {% else %} -RewriteCond ${lowercase:%{SERVER_NAME}} ^[a-z0-9_-]+\.id\.fedoraproject\.org$ +RewriteCond ${lowercase:%{SERVER_NAME}} ^[a-z0-9_\.-]+\.id\.fedoraproject\.org$ RewriteRule ^(.+) ${lowercase:%{SERVER_NAME}}$1 [C] -RewriteRule ^([a-z0-9_-]+)\.id\.fedoraproject\.org/.* /openid/id/$1/ [PT] +RewriteRule ^([a-z0-9_\.-]+)\.id\.fedoraproject\.org/.* /openid/id/$1/ [PT] {% endif %} diff --git a/roles/ipsilon/templates/saml2_data b/roles/ipsilon/templates/saml2_data index 27d7e31e32..8bfc9ad4bd 100644 --- a/roles/ipsilon/templates/saml2_data +++ b/roles/ipsilon/templates/saml2_data @@ -47,7 +47,7 @@ rhbz id = https://bugzilla.redhat.com/saml2_metadata.cgi rhbz type = SP rhbz name = Red Hat Bugzilla rhbz Allowed Attributes = ["email"] -rhbz metadata = MIIF7TCCBNWgAwIBAgIED/8LBzANBgkqhkiG9w0BAQsFADBBMRAwDgYDVQQKDAdSZWQgSGF0MQ0wCwYDVQQLDARwcm9kMR4wHAYDVQQDDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTgwNzE4MDIxNzE4WhcNMjAwNzE3MDIxNzE4WjCBuDELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9saW5hMRAwDgYDVQQHDAdSYWxlaWdoMRYwFAYDVQQKDA1SZWQgSGF0LCBJbmMuMRMwEQYDVQQLDApQblQgRGV2T3BzMS0wKwYDVQQDDCRidWd6aWxsYS5hcHAucHJvZC5iei5waHgyLnJlZGhhdC5jb20xIjAgBgkqhkiG9w0BCQEWE2hlbHAtb3BzQHJlZGhhdC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC33pwPrNc9bpBL/45vSaD/IktOSAi8D0LQ1K7/b50jqVxv/TAJNnkAuJwB63WFiGa4rWFnIMfHII6PkENl93ipvAyQvWoPs+7ajxTX/2TWeiVyelvJfJ8fBybljBRjy71wERfa5YJFTBq6EOONspojr3y5ArLqfwL4hlgS9mdlsnGKhBdKpc3WbycAo3NDnADgtV2qQeepJce/asCf59nfyU24Mj1SPI45HtISGzUU9aAtvifeNiRjg1JRNmZ3ea6YDqPLHgguWGwPAWGTwUJ1UZ2H/BPd59hX6JKHJ7QSyPvUAYU/jVTKIKJcVhYBqoft/yguK2yWE659ma7da+lLBxpQuw9WY8sOtqWCcWopXa9b6+xfdwniOQIoc26DeMsKmefCNuVznY7Ao6kx/j9wxQ5Ees2Fg8VoUwYHyL6Jftc6fs2HLeixoXUgviiRobn9O73EZqNCC2gnLRfi7LpXjZNCB0QZuhDOccu79zaNE0F6whRxX+8t4d+CWlsvz+7J4Hg3cxBcDEumH/N2XAmpCXZccKfPqxVwqIOT3KUz5gko/EQWl92jCa2N7xRidUeZCyteOoGBfAD22rg+B+YxFaiz1tlxkK2OtoK69MFk3DicfQACH5JtsbRgm8g3SWgjBTehpGogSHVvBoSb+e297lfrByX2UcVzugYjV/FSIwIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUe9oJ9Uld2ddcyTb4VdIbl54RL34wgd8GA1UdEQSB1zCB1IIkYnVnemlsbGEuYXBwLnByb2QuYnoucGh4Mi5yZWRoYXQuY29tgihidWd3ZWItdm0tMDEuYXBwLnByb2QuYnoucGh4Mi5yZWRoYXQuY29tgitzdmNiei1idWd3ZWItMDEuYXBwLnByb2QuYnoucGh4Mi5yZWRoYXQuY29tgihidWd3ZWItdm0tMDIuYXBwLnByb2QuYnoucGh4Mi5yZWRoYXQuY29tgitzdmNiei1idWd3ZWItMDIuYXBwLnByb2QuYnoucGh4Mi5yZWRoYXQuY29tMDsGCCsGAQUFBwEBBC8wLTArBggrBgEFBQcwAYYfaHR0cDovL29jc3AucmVkaGF0LmNvbS9jYS9vY3NwLzAOBgNVHQ8BAf8EBAMCBPAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQCeurLcwP5Veomg6HCD/eXn75S9PrbVaW/p/uYQFNIffXYkAB9VHQkoVHoaRB4fHg7LmbJ7Kb+pE897/GrjSU3XGe71+Teiu2/9vLZrcI60fVTwuodSjs6A3fqCGlytCZU9/ZEIhZtMzd+lNopaBKeNcZPoQaDtSWDKuivfYOqzx3gzqXadUF+AZrZItRr52vsuLHSNmU9V6s7Kl0iaVzZJ3PdhRtCoU+y2mCAaQWGPUX/6UjWmx9DFOx6H9BsF2qHexAm9FM3rrrkocV8QY/FUxoSOcItQpqScWZQ3dFUs3MT/yqgXz/htiFxATRzhv6aB3+dFpQ8wK1W504WApdm2 MIIF7TCCBNWgAwIBAgIED/8LBzANBgkqhkiG9w0BAQsFADBBMRAwDgYDVQQKDAdSZWQgSGF0MQ0wCwYDVQQLDARwcm9kMR4wHAYDVQQDDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTgwNzE4MDIxNzE4WhcNMjAwNzE3MDIxNzE4WjCBuDELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9saW5hMRAwDgYDVQQHDAdSYWxlaWdoMRYwFAYDVQQKDA1SZWQgSGF0LCBJbmMuMRMwEQYDVQQLDApQblQgRGV2T3BzMS0wKwYDVQQDDCRidWd6aWxsYS5hcHAucHJvZC5iei5waHgyLnJlZGhhdC5jb20xIjAgBgkqhkiG9w0BCQEWE2hlbHAtb3BzQHJlZGhhdC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC33pwPrNc9bpBL/45vSaD/IktOSAi8D0LQ1K7/b50jqVxv/TAJNnkAuJwB63WFiGa4rWFnIMfHII6PkENl93ipvAyQvWoPs+7ajxTX/2TWeiVyelvJfJ8fBybljBRjy71wERfa5YJFTBq6EOONspojr3y5ArLqfwL4hlgS9mdlsnGKhBdKpc3WbycAo3NDnADgtV2qQeepJce/asCf59nfyU24Mj1SPI45HtISGzUU9aAtvifeNiRjg1JRNmZ3ea6YDqPLHgguWGwPAWGTwUJ1UZ2H/BPd59hX6JKHJ7QSyPvUAYU/jVTKIKJcVhYBqoft/yguK2yWE659ma7da+lLBxpQuw9WY8sOtqWCcWopXa9b6+xfdwniOQIoc26DeMsKmefCNuVznY7Ao6kx/j9wxQ5Ees2Fg8VoUwYHyL6Jftc6fs2HLeixoXUgviiRobn9O73EZqNCC2gnLRfi7LpXjZNCB0QZuhDOccu79zaNE0F6whRxX+8t4d+CWlsvz+7J4Hg3cxBcDEumH/N2XAmpCXZccKfPqxVwqIOT3KUz5gko/EQWl92jCa2N7xRidUeZCyteOoGBfAD22rg+B+YxFaiz1tlxkK2OtoK69MFk3DicfQACH5JtsbRgm8g3SWgjBTehpGogSHVvBoSb+e297lfrByX2UcVzugYjV/FSIwIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUe9oJ9Uld2ddcyTb4VdIbl54RL34wgd8GA1UdEQSB1zCB1IIkYnVnemlsbGEuYXBwLnByb2QuYnoucGh4Mi5yZWRoYXQuY29tgihidWd3ZWItdm0tMDEuYXBwLnByb2QuYnoucGh4Mi5yZWRoYXQuY29tgitzdmNiei1idWd3ZWItMDEuYXBwLnByb2QuYnoucGh4Mi5yZWRoYXQuY29tgihidWd3ZWItdm0tMDIuYXBwLnByb2QuYnoucGh4Mi5yZWRoYXQuY29tgitzdmNiei1idWd3ZWItMDIuYXBwLnByb2QuYnoucGh4Mi5yZWRoYXQuY29tMDsGCCsGAQUFBwEBBC8wLTArBggrBgEFBQcwAYYfaHR0cDovL29jc3AucmVkaGF0LmNvbS9jYS9vY3NwLzAOBgNVHQ8BAf8EBAMCBPAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQCeurLcwP5Veomg6HCD/eXn75S9PrbVaW/p/uYQFNIffXYkAB9VHQkoVHoaRB4fHg7LmbJ7Kb+pE897/GrjSU3XGe71+Teiu2/9vLZrcI60fVTwuodSjs6A3fqCGlytCZU9/ZEIhZtMzd+lNopaBKeNcZPoQaDtSWDKuivfYOqzx3gzqXadUF+AZrZItRr52vsuLHSNmU9V6s7Kl0iaVzZJ3PdhRtCoU+y2mCAaQWGPUX/6UjWmx9DFOx6H9BsF2qHexAm9FM3rrrkocV8QY/FUxoSOcItQpqScWZQ3dFUs3MT/yqgXz/htiFxATRzhv6aB3+dFpQ8wK1W504WApdm2 urn:oasis:names:tc:SAML:2.0:nameid-format:persistent Administrator bugzilla-owner@redhat.com +rhbz metadata = MIIGHTCCBQWgAwIBAgIED/4C+DANBgkqhkiG9w0BAQsFADBBMRAwDgYDVQQKDAdSZWQgSGF0MQ0wCwYDVQQLDARwcm9kMR4wHAYDVQQDDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMjAwNzE2MDA0NTQ5WhcNMjIwNzE2MDA0NTQ5WjCBwTELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9saW5hMRAwDgYDVQQHDAdSYWxlaWdoMRYwFAYDVQQKDA1SZWQgSGF0LCBJbmMuMRMwEQYDVQQLDApQblQgRGV2T3BzMS0wKwYDVQQDDCRidWd6aWxsYS5hcHAucHJvZC5iei5waHgyLnJlZGhhdC5jb20xKzApBgkqhkiG9w0BCQEWHHBudC1kZXZvcHMtc3lzb3BzQHJlZGhhdC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDMTw9TZxaOom7W+Ozj4k2rYTUoc7WVCwbcMeXOjfuybycAViVNPBYwr6QYsU3+IuFupM4sf1u3xjgj7dgZkPl/JUUVOMLUBZI4faE7H91/3BKZbosm4qalTIoBSejwys5UexbhOZg4PH/njJHkKTVaYCXN1s4Ya8Sqrqu6Iz9zlszIWaJ0lEVHRgn99FxCLYDy+DqvhcVaOIChh66/QLewYfIK0OcLI3fBr92jIxmGTQ4DxBtBFPGNvpxr9AXt14nuX9G/jHL4vzOqoLGOz2BIVaKlyt78ijm0ICOCDyXtfFr5E8apRrAB5lnQAIa24H84zfhJbBJCGPj4h6iJZclXJiymT7mimfLVSjqsemPKNtD7wGootONYlB0kLc4vxPRMSuKyXsZphwfnMWxWK62yvtbZ4eq9qQQA/alCYyhRLfErIYbhF/rK4IUwaCa+KUTW3KcPJ2sNIdhnehWx1BhNpUZ80PkeIfGHvut+Bf3nP7/9s50AvOmpEMAECDfFsax1n/TBKAFLNLciFYk5XXBcjx9hLNbq8TrESeScb3vaQN/BXtULJvWNwt0sIK1dR+DleOmNFnAW8CIC6SwjGY0N+R+9XY9RTt68PHYNOhGH6fmiFoWTrHGzTAG9Lu0TkO1sz4+IzEGKbeNcR+GdBtwfAH1BvK0TK42X5tZ2FqC8fwIDAQABo4IBmjCCAZYwHwYDVR0jBBgwFoAUe9oJ9Uld2ddcyTb4VdIbl54RL34wOwYIKwYBBQUHAQEELzAtMCsGCCsGAQUFBzABhh9odHRwOi8vb2NzcC5yZWRoYXQuY29tL2NhL29jc3AvMA4GA1UdDwEB/wQEAwIE8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwggEFBgNVHREEgf0wgfqCJGJ1Z3ppbGxhLmFwcC5wcm9kLmJ6LnBoeDIucmVkaGF0LmNvbYIkYnVnemlsbGEuYXBwLnByb2QuYnoucGh4Mi5yZWRoYXQuY29tgihidWd3ZWItdm0tMDEuYXBwLnByb2QuYnoucGh4Mi5yZWRoYXQuY29tgitzdmNiei1idWd3ZWItMDEuYXBwLnByb2QuYnoucGh4Mi5yZWRoYXQuY29tgihidWd3ZWItdm0tMDIuYXBwLnByb2QuYnoucGh4Mi5yZWRoYXQuY29tgitzdmNiei1idWd3ZWItMDIuYXBwLnByb2QuYnoucGh4Mi5yZWRoYXQuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBBx1y57pufG4FvXrhToIGUQUatMKtq8jiUoef/vGuL1tt/9s56CfHb6qJZGTlMhfcxHQhWSf3pqt59T96zIr8cykoF0x44Uu/o1oaGxSTaU+LElpqNuxvj23JJLlGSUxLd6ElpuuFUdWpRo82YmCBk7CSkkndYBB+Qloc2jb8TQgoGM2tUTTD2BVBofGa74VUO10xSQu8GiiNS8KwlP23NZgvUeaKUekB0Nw3S7eyYn7TG4+j0f/Wfx04ObYpfeSvy2k/oHtoEB44yg3fSCZHvbPSepUhkiPAzSZiabfZCsMNFPRv3035s3rVO9SHbu/5qKsYtZZLKWDIkSdgKjrZxMIIGHTCCBQWgAwIBAgIED/4C+DANBgkqhkiG9w0BAQsFADBBMRAwDgYDVQQKDAdSZWQgSGF0MQ0wCwYDVQQLDARwcm9kMR4wHAYDVQQDDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMjAwNzE2MDA0NTQ5WhcNMjIwNzE2MDA0NTQ5WjCBwTELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9saW5hMRAwDgYDVQQHDAdSYWxlaWdoMRYwFAYDVQQKDA1SZWQgSGF0LCBJbmMuMRMwEQYDVQQLDApQblQgRGV2T3BzMS0wKwYDVQQDDCRidWd6aWxsYS5hcHAucHJvZC5iei5waHgyLnJlZGhhdC5jb20xKzApBgkqhkiG9w0BCQEWHHBudC1kZXZvcHMtc3lzb3BzQHJlZGhhdC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDMTw9TZxaOom7W+Ozj4k2rYTUoc7WVCwbcMeXOjfuybycAViVNPBYwr6QYsU3+IuFupM4sf1u3xjgj7dgZkPl/JUUVOMLUBZI4faE7H91/3BKZbosm4qalTIoBSejwys5UexbhOZg4PH/njJHkKTVaYCXN1s4Ya8Sqrqu6Iz9zlszIWaJ0lEVHRgn99FxCLYDy+DqvhcVaOIChh66/QLewYfIK0OcLI3fBr92jIxmGTQ4DxBtBFPGNvpxr9AXt14nuX9G/jHL4vzOqoLGOz2BIVaKlyt78ijm0ICOCDyXtfFr5E8apRrAB5lnQAIa24H84zfhJbBJCGPj4h6iJZclXJiymT7mimfLVSjqsemPKNtD7wGootONYlB0kLc4vxPRMSuKyXsZphwfnMWxWK62yvtbZ4eq9qQQA/alCYyhRLfErIYbhF/rK4IUwaCa+KUTW3KcPJ2sNIdhnehWx1BhNpUZ80PkeIfGHvut+Bf3nP7/9s50AvOmpEMAECDfFsax1n/TBKAFLNLciFYk5XXBcjx9hLNbq8TrESeScb3vaQN/BXtULJvWNwt0sIK1dR+DleOmNFnAW8CIC6SwjGY0N+R+9XY9RTt68PHYNOhGH6fmiFoWTrHGzTAG9Lu0TkO1sz4+IzEGKbeNcR+GdBtwfAH1BvK0TK42X5tZ2FqC8fwIDAQABo4IBmjCCAZYwHwYDVR0jBBgwFoAUe9oJ9Uld2ddcyTb4VdIbl54RL34wOwYIKwYBBQUHAQEELzAtMCsGCCsGAQUFBzABhh9odHRwOi8vb2NzcC5yZWRoYXQuY29tL2NhL29jc3AvMA4GA1UdDwEB/wQEAwIE8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwggEFBgNVHREEgf0wgfqCJGJ1Z3ppbGxhLmFwcC5wcm9kLmJ6LnBoeDIucmVkaGF0LmNvbYIkYnVnemlsbGEuYXBwLnByb2QuYnoucGh4Mi5yZWRoYXQuY29tgihidWd3ZWItdm0tMDEuYXBwLnByb2QuYnoucGh4Mi5yZWRoYXQuY29tgitzdmNiei1idWd3ZWItMDEuYXBwLnByb2QuYnoucGh4Mi5yZWRoYXQuY29tgihidWd3ZWItdm0tMDIuYXBwLnByb2QuYnoucGh4Mi5yZWRoYXQuY29tgitzdmNiei1idWd3ZWItMDIuYXBwLnByb2QuYnoucGh4Mi5yZWRoYXQuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBBx1y57pufG4FvXrhToIGUQUatMKtq8jiUoef/vGuL1tt/9s56CfHb6qJZGTlMhfcxHQhWSf3pqt59T96zIr8cykoF0x44Uu/o1oaGxSTaU+LElpqNuxvj23JJLlGSUxLd6ElpuuFUdWpRo82YmCBk7CSkkndYBB+Qloc2jb8TQgoGM2tUTTD2BVBofGa74VUO10xSQu8GiiNS8KwlP23NZgvUeaKUekB0Nw3S7eyYn7TG4+j0f/Wfx04ObYpfeSvy2k/oHtoEB44yg3fSCZHvbPSepUhkiPAzSZiabfZCsMNFPRv3035s3rVO9SHbu/5qKsYtZZLKWDIkSdgKjrZxurn:oasis:names:tc:SAML:2.0:nameid-format:persistentAdministratorbugzilla-owner@redhat.com awx id = https://awx.fedoraproject.org/ awx type = SP diff --git a/roles/ipsilon/templates/sssd.conf b/roles/ipsilon/templates/sssd.conf index ed577d6fdb..f929ffa065 100644 --- a/roles/ipsilon/templates/sssd.conf +++ b/roles/ipsilon/templates/sssd.conf @@ -10,6 +10,7 @@ access_provider = ipa cache_credentials = True ldap_tls_cacert = /etc/ipa/ca.crt krb5_store_password_if_offline = True +ldap_deref_threshold = 0 sudo_provider = ipa autofs_provider = ipa subdomains_provider = ipa diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml index 0fa411b608..8bbe1a7102 100644 --- a/roles/koji_builder/tasks/main.yml +++ b/roles/koji_builder/tasks/main.yml @@ -74,8 +74,6 @@ - mock - kernel-firmware - kernel-modules - - ntp - - ntpdate - rsyslog - audit - pycdio diff --git a/roles/koji_hub/files/koji-sidetag-cleanup b/roles/koji_hub/files/koji-sidetag-cleanup new file mode 100644 index 0000000000..de708f8dbb --- /dev/null +++ b/roles/koji_hub/files/koji-sidetag-cleanup @@ -0,0 +1,3 @@ +# Clean up sidetags. +MAILTO=releng-cron@lists.fedoraproject.org +0 4 * * * root /usr/local/bin/lock-wrapper koji-sidetag-cleanup "/usr/sbin/koji-sidetag-cleanup --empty-delay=14 --old-delay=30" diff --git a/roles/koji_hub/tasks/main.yml b/roles/koji_hub/tasks/main.yml index c08d362cc8..e33142d1cb 100644 --- a/roles/koji_hub/tasks/main.yml +++ b/roles/koji_hub/tasks/main.yml @@ -445,6 +445,7 @@ - koji-directory-cleanup - koji-gc - koji-prune-signed-copies + - koji-sidetag-cleanup tags: - files - koji_hub @@ -455,6 +456,7 @@ - koji-directory-cleanup - koji-gc - koji-prune-signed-copies + - koji-sidetag-cleanup tags: - files when: env != 'staging' and ansible_hostname.startswith('koji02') diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2 index eeb37e2c7c..b9c719d828 100644 --- a/roles/koji_hub/templates/hub.conf.j2 +++ b/roles/koji_hub/templates/hub.conf.j2 @@ -93,12 +93,12 @@ Plugins = fedmsg-koji-plugin runroot_hub hub_containerbuild tag2distrepo sidetag [policy] tag = - user mbs/mbs.fedoraproject.org && tag module-* && package kernel shim grub2 pesign fwupd :: allow - user mbs/mbs.fedoraproject.org && fromtag module-* && package kernel shim grub2 pesign fwupd :: allow - user bodhi && tag *-override && package kernel shim grub2 pesign fwupd :: allow - has_perm autosign && fromtag *-pending && package kernel shim grub2 pesign fwupd :: allow - has_perm autosign && fromtag *-candidate && package kernel shim grub2 pesign fwupd :: allow - has_perm secure-boot && package kernel shim grub2 pesign fwupd :: allow + user mbs/mbs.fedoraproject.org && tag module-* && package kernel shim grub2 pesign fwupd fwupd-efi :: allow + user mbs/mbs.fedoraproject.org && fromtag module-* && package kernel shim grub2 pesign fwupd fwupd-efi:: allow + user bodhi && tag *-override && package kernel shim grub2 pesign fwupd fwupd-efi :: allow + has_perm autosign && fromtag *-pending && package kernel shim grub2 pesign fwupd fwupd-efi :: allow + has_perm autosign && fromtag *-candidate && package kernel shim grub2 pesign fwupd fwupd-efi :: allow + has_perm secure-boot && package kernel shim grub2 pesign fwupd fwupd-efi :: allow # CoreOS continuous builds, https://pagure.io/releng/issue/8165 operation tag && tag f*-coreos-continuous && has_perm coreos-continuous :: allow operation untag && fromtag f*-coreos-continuous && has_perm coreos-continuous :: allow @@ -110,7 +110,7 @@ tag = operation tag && tag eln* && has_perm eln :: allow operation untag && fromtag eln* && has_perm eln :: allow # deny tagging secureboot packages that are not related to coreos-continuous and eln - package kernel shim grub2 pesign fwupd :: deny + package kernel shim grub2 pesign fwupd fwupd-efi :: deny # Allow people to tag stuff into infra-candidate if they're infra tag *-infra-candidate && has_perm infra :: allow tag *-infra-candidate :: deny @@ -138,6 +138,7 @@ channel = source */pesign* && has_perm secure-boot :: use secure-boot source */fwupdate* && has_perm secure-boot :: use secure-boot source */fwupd* && has_perm secure-boot :: use secure-boot + source */fwupd-efi* && has_perm secure-boot :: use secure-boot # set this package to use the 'heavybuilder' channel. Note that this is NOT good for most anything. # It just happens to be for this particular package. Please check before adding anything here, you could @@ -187,7 +188,6 @@ sidetag = tag f35-build :: allow tag f34-build :: allow tag f33-build :: allow - tag f32-build :: allow tag eln-build :: allow tag epel8-build :: allow tag epel7-build :: allow diff --git a/roles/koji_hub/templates/kojira.conf.j2 b/roles/koji_hub/templates/kojira.conf.j2 index e883860824..3a1f59c5eb 100644 --- a/roles/koji_hub/templates/kojira.conf.j2 +++ b/roles/koji_hub/templates/kojira.conf.j2 @@ -27,6 +27,7 @@ separate_source_tags=f{{ FedoraRawhideNumber }}-build eln-build ; prevent repo cleanup from stalling repo regen ;prune_batch_size=1 ;delete_batch_size=1 +max_delete_processes=20 ; prevent kojira from flooding the build system with newRepo tasks max_repo_tasks=30 diff --git a/roles/mbs/common/files/default-modules.production/platform-f32.yaml b/roles/mbs/common/files/default-modules.production/platform-f32.yaml deleted file mode 100644 index d1405fbed3..0000000000 --- a/roles/mbs/common/files/default-modules.production/platform-f32.yaml +++ /dev/null @@ -1,28 +0,0 @@ -data: - description: Fedora 32 traditional base - license: - module: [MIT] - name: platform - profiles: - buildroot: - rpms: [bash, bzip2, coreutils, cpio, diffutils, fedora-release, findutils, gawk, - glibc-minimal-langpack, grep, gzip, info, make, patch, redhat-rpm-config, - rpm-build, sed, shadow-utils, tar, unzip, util-linux, which, xz] - srpm-buildroot: - rpms: [bash, fedora-release, fedpkg-minimal, glibc-minimal-langpack, gnupg2, - redhat-rpm-config, rpm-build, shadow-utils] - stream: f32 - summary: Fedora 32 traditional base - context: 00000000 - version: 1 - xmd: - mbs: - buildrequires: {} - commit: f32 - requires: {} - koji_tag: module-f32-build - mse: TRUE - virtual_streams: [fedora] -document: modulemd -version: 1 - diff --git a/roles/mirrormanager/backend/files/umdl-required b/roles/mirrormanager/backend/files/umdl-required index 51dd138931..5ed7b3e1a8 100644 --- a/roles/mirrormanager/backend/files/umdl-required +++ b/roles/mirrormanager/backend/files/umdl-required @@ -1,5 +1,11 @@ #!/bin/bash +# This script checks for changes on the primary mirror and +# updates the database if changes are found. For most categories +# the script first checks if a fullfiletimelist- +# exists and runs the actual primary mirror scan if that file +# has changed. + if [ $# -ne 2 ]; then echo "Exactly two parameter needed. category and /path/to/logfile" exit 1 @@ -9,12 +15,13 @@ exec >> $2 exec 2>&1 CURDATE=`date +%s` - +SCANNER="/usr/bin/mm2_update-master-directory-list" if [ "${1}" == "fedora" ]; then CATEGORY="Linux" elif [ "${1}" == "epel" ]; then CATEGORY="EPEL" + SCANNER="/usr/local/bin/scan-primary-mirror" elif [ "${1}" == "alt" ]; then CATEGORY="Other" elif [ "${1}" == "fedora-secondary" ]; then @@ -34,7 +41,7 @@ fi # FULLFILETIMELIST -> FFTL if [ "${1}" == "codecs" ]; then - /usr/local/bin/lock-wrapper umdl-${1} "/usr/bin/mm2_update-master-directory-list --category \"Fedora ${CATEGORY}\"" + /usr/local/bin/lock-wrapper umdl-${1} "${SCANNER} --category \"Fedora ${CATEGORY}\"" exit 0 else FFTL="/srv/pub/${1}/fullfiletimelist-${1}" @@ -55,7 +62,7 @@ fi echo -n "${FFTL} has changed since last run. Running umdl for Fedora ${CATEGORY} at " date -/usr/local/bin/lock-wrapper umdl-${1} "/usr/bin/mm2_update-master-directory-list --category \"Fedora ${CATEGORY}\"" +/usr/local/bin/lock-wrapper umdl-${1} "${SCANNER} --category \"Fedora ${CATEGORY}\"" if [ "$?" -eq "0" ]; then # success! remember the date of this run diff --git a/roles/mirrormanager/backend/tasks/main.yml b/roles/mirrormanager/backend/tasks/main.yml index 49b4277729..7db2b79e23 100644 --- a/roles/mirrormanager/backend/tasks/main.yml +++ b/roles/mirrormanager/backend/tasks/main.yml @@ -154,16 +154,33 @@ owner: mirrormanager group: mirrormanager mode: 0600 +- name: install scan-primary-mirror configuration file + template: + src: scan-primary-mirror.toml + dest: /etc/mirrormanager/scan-primary-mirror.toml + owner: mirrormanager + group: mirrormanager + mode: 0600 - name: create /srv/mirrorlist-server.git file: path=/srv/mirrorlist-server.git state=directory owner=mirrormanager group=mirrormanager mode=0755 +- name: create /srv/scan-primary-mirror.git + file: path=/srv/scan-primary-mirror.git state=directory owner=mirrormanager group=mirrormanager mode=0755 - name: checkout mirrorlist-server git: repo: https://github.com/adrianreber/mirrorlist-server.git - version: 3.0.2 + version: 3.0.4 dest: /srv/mirrorlist-server.git become: yes become_user: mirrormanager register: mirrorlist_server_downloaded +- name: checkout scan-primary-mirror + git: + repo: https://github.com/adrianreber/scan-primary-mirror.git + version: 0.1.1 + dest: /srv/scan-primary-mirror.git + become: yes + become_user: mirrormanager + register: scan_primary_mirror_downloaded - name: build generate-mirrorlist-cache command: "cargo build --release --bin generate-mirrorlist-cache" args: @@ -172,6 +189,14 @@ become_user: mirrormanager register: mirrorlist_server_built when: "mirrorlist_server_downloaded is changed" +- name: build scan-primary-mirror + command: "cargo build --release" + args: + chdir: /srv/scan-primary-mirror.git + become: yes + become_user: mirrormanager + register: scan_primary_mirror_built + when: "scan_primary_mirror_downloaded is changed" - name: install generate-mirrorlist-cache copy: src: /srv/mirrorlist-server.git/target/release/generate-mirrorlist-cache @@ -179,5 +204,14 @@ remote_src: yes owner: root group: root - mode: 755 + mode: 0755 when: "mirrorlist_server_built is changed" +- name: install scan-primary-mirror + copy: + src: /srv/scan-primary-mirror.git/target/release/scan-primary-mirror + dest: /usr/local/bin/scan-primary-mirror + remote_src: yes + owner: root + group: root + mode: 0755 + when: "scan_primary_mirror_built is changed" diff --git a/roles/mirrormanager/backend/templates/scan-primary-mirror.toml b/roles/mirrormanager/backend/templates/scan-primary-mirror.toml new file mode 100644 index 0000000000..1f6ef4dce9 --- /dev/null +++ b/roles/mirrormanager/backend/templates/scan-primary-mirror.toml @@ -0,0 +1,84 @@ +max_propagation_days = 2 +max_stale_days = 3 +excludes=[".*\\.snapshot", ".*/\\.~tmp~"] +skip_paths_for_version=["pub/alt"] +test_paths=["/test/", "/stage/"] +skip_repository_paths = ["Cloud", "Workstation", "Server", "drpms", "source"] +do_not_display_paths = ["_Beta"] + +[database] +url="postgresql://{{ mirrormanager_db_user }}:{{ mirrormanager_db_pass }}@{{ mirrormanager_db_host }}/{{ mirrormanager_db_name }}" + +### EPEL ### + +[[category]] +name="Fedora EPEL" +type="directory" +url="/srv/pub/epel/" + +[[repository_mapping]] +regex="pub/epel/testing/[\\d]/[^M].*" +prefix="testing-epel" + +[[repository_mapping]] +regex="pub/epel/[\\d]/[^M].*" +prefix="epel" + +[[repository_mapping]] +regex="pub/epel/[\\d]/Modular/.*" +prefix="epel-modular" + +[[repository_mapping]] +regex="pub/epel/testing/next/[\\d]/Everything/.*" +prefix="epel-testing-next" + +[[repository_mapping]] +regex="pub/epel/next/[\\d]/Everything/.*" +prefix="epel-next" + +[[repository_mapping]] +regex="pub/epel/playground/[\\d]/Everything/.*" +prefix="epel-playground" + +[[repository_mapping]] +regex="pub/epel/testing/[\\d]/Modular/.*" +prefix="testing-modular-epel" + +[[repository_aliases]] +from="testing-modular-epel-debug-" +to="testing-modular-debug-epel" + +# The following repository_aliases are only necessary for EPEL +# because it has some unusual repository names. + +[[repository_aliases]] +from="epel-playground-" +to="playground-epel" + +[[repository_aliases]] +from="epel-playground-debug-" +to="playground-debug-epel" + +[[repository_aliases]] +from="epel-playground-source-" +to="playground-source-epel" + +[[repository_aliases]] +from="testing-modular-epel-source-" +to="testing-modular-source-epel" + +[[repository_aliases]] +from="testing-epel-debug-" +to="testing-debug-epel" + +[[repository_aliases]] +from="testing-epel-source-" +to="testing-source-epel" + +[[repository_aliases]] +from="testing-epel-" +to="testing-epel" + +[[repository_aliases]] +from="testing-modular-epel-" +to="testing-modular-epel" diff --git a/roles/nagios_client/files/scripts/check_systemd_units b/roles/nagios_client/files/scripts/check_systemd_units index 098a53f892..a20003cb75 100644 --- a/roles/nagios_client/files/scripts/check_systemd_units +++ b/roles/nagios_client/files/scripts/check_systemd_units @@ -39,9 +39,9 @@ done # check the lenght of array and print result/exit code for nagios if [ ${#failed_array[@]} -ne "0" ]; then - echo -e "WARNING - Failed systemd units after restart : ${failed_array[@]}" + echo -e "UNITS WARNING: Failed systemd units after restart : ${failed_array[@]}" exit ${warning_exit} elif [ ${#failed_array[@]} -eq "0" ]; then - echo -e "OK - Systemd units are active" + echo -e "UNITS OK: Systemd units are active" exit ${ok_exit} fi diff --git a/roles/nagios_client/templates/check_datanommer_history.cfg.j2 b/roles/nagios_client/templates/check_datanommer_history.cfg.j2 index aa58c83043..09077675ca 100644 --- a/roles/nagios_client/templates/check_datanommer_history.cfg.j2 +++ b/roles/nagios_client/templates/check_datanommer_history.cfg.j2 @@ -20,7 +20,6 @@ command[check_datanommer_bodhi_composes]={{libdir}}/nagios/plugins/check_datanom command[check_datanommer_buildsys]={{libdir}}/nagios/plugins/check_datanommer_timesince.py buildsys 14400 86400 command[check_datanommer_compose]={{libdir}}/nagios/plugins/check_datanommer_timesince.py compose 259200 1814400 command[check_datanommer_copr]={{libdir}}/nagios/plugins/check_datanommer_timesince.py copr 21600 86400 -command[check_datanommer_faf]={{libdir}}/nagios/plugins/check_datanommer_timesince.py faf 86400 259200 command[check_datanommer_fas]={{libdir}}/nagios/plugins/check_datanommer_timesince.py fas 1814400 2628000 command[check_datanommer_fedbadges]={{libdir}}/nagios/plugins/check_datanommer_timesince.py fedbadges 86400 259200 command[check_datanommer_fedimg]={{libdir}}/nagios/plugins/check_datanommer_timesince.py fedimg 259200 604800 diff --git a/roles/nagios_client/templates/check_fedmsg_consumers.cfg.j2 b/roles/nagios_client/templates/check_fedmsg_consumers.cfg.j2 index cc709c26a8..7c680e6f5f 100644 --- a/roles/nagios_client/templates/check_fedmsg_consumers.cfg.j2 +++ b/roles/nagios_client/templates/check_fedmsg_consumers.cfg.j2 @@ -11,11 +11,10 @@ command[check_fedmsg_cp_app]={{libdir}}/nagios/plugins/check_fedmsg_producers_co command[check_fedmsg_cp_value]={{libdir}}/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-irc IRCBotConsumer MonitoringProducer command[check_fedmsg_cp_badges_backend]={{libdir}}/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub FedoraBadgesConsumer MonitoringProducer command[check_fedmsg_cp_notifs_backend]={{libdir}}/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub FMNConsumer DigestProducer ConfirmationProducer MonitoringProducer -command[check_fedmsg_cp_bugzilla2fedmsg]={{libdir}}/nagios/plugins/check_fedmsg_producers_consumers.py moksha-hub BugzillaConsumer MonitoringProducer command[check_fedmsg_cp_fedimg_backend]={{libdir}}/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub FedimgConsumer MonitoringProducer command[check_fedmsg_cp_hotness_backend]={{libdir}}/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub BugzillaTicketFiler MonitoringProducer command[check_fedmsg_cp_packages_backend]={{libdir}}/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub CacheInvalidator MonitoringProducer -command[check_fedmsg_cp_mbs_backend]={{libdir}}/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub MBSConsumer MBSProducer MonitoringProducer +command[check_fedmsg_cp_mbs_backend]={{libdir}}/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub MBSConsumer MonitoringProducer command[check_fedmsg_cexceptions_busgateway_hub]={{libdir}}/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub Nommer 1 10 command[check_fedmsg_cexceptions_busgateway_relay]={{libdir}}/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-relay RelayConsumer 1 10 @@ -29,7 +28,6 @@ command[check_fedmsg_cexceptions_app]={{libdir}}/nagios/plugins/check_fedmsg_con command[check_fedmsg_cexceptions_value]={{libdir}}/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-irc IRCBotConsumer 1 10 command[check_fedmsg_cexceptions_badges_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub FedoraBadgesConsumer 1 10 command[check_fedmsg_cexceptions_notifs_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub FMNConsumer 1 10 -command[check_fedmsg_cexceptions_bugzilla2fedmsg]={{libdir}}/nagios/plugins/check_fedmsg_consumer_exceptions.py moksha-hub BugzillaConsumer 1 10 command[check_fedmsg_cexceptions_fedimg_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub FedimgConsumer 1 10 command[check_fedmsg_cexceptions_hotness_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub BugzillaTicketFiler 1 10 command[check_fedmsg_cexceptions_packages_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub CacheInvalidator 1 10 diff --git a/roles/nagios_server/files/nagios/services/iad2_internal/fedmsg.cfg b/roles/nagios_server/files/nagios/services/iad2_internal/fedmsg.cfg index 6f8a2b2844..e548d18b47 100644 --- a/roles/nagios_server/files/nagios/services/iad2_internal/fedmsg.cfg +++ b/roles/nagios_server/files/nagios/services/iad2_internal/fedmsg.cfg @@ -177,13 +177,6 @@ define service { use defaulttemplate } -define service { - host_name busgateway01.iad2.fedoraproject.org - service_description Check datanommer for recent faf messages - check_command check_by_nrpe!check_datanommer_faf - use defaulttemplate -} - define service { host_name busgateway01.iad2.fedoraproject.org service_description Check datanommer for recent mailman messages @@ -278,12 +271,12 @@ define service { use defaulttemplate } -define service { - host_name bugzilla2fedmsg01.iad2.fedoraproject.org - service_description Check fedmsg consumers and producers hub - check_command check_by_nrpe!check_fedmsg_cp_bugzilla2fedmsg - use defaulttemplate -} +#define service { +# host_name bugzilla2fedmsg01.iad2.fedoraproject.org +# service_description Check fedmsg consumers and producers hub +# check_command check_by_nrpe!check_fedmsg_cp_bugzilla2fedmsg +# use defaulttemplate +#} define service { host_name fedimg01.iad2.fedoraproject.org @@ -351,12 +344,12 @@ define service { use defaulttemplate } -define service { - host_name bugzilla2fedmsg01.iad2.fedoraproject.org - service_description Check fedmsg-hub consumers exceptions - check_command check_by_nrpe!check_fedmsg_cexceptions_bugzilla2fedmsg - use defaulttemplate -} +#define service { +# host_name bugzilla2fedmsg01.iad2.fedoraproject.org +# service_description Check fedmsg-hub consumers exceptions +# check_command check_by_nrpe!check_fedmsg_cexceptions_bugzilla2fedmsg +# use defaulttemplate +#} define service { host_name fedimg01.iad2.fedoraproject.org @@ -425,12 +418,12 @@ define service { use defaulttemplate } -define service { - host_name bugzilla2fedmsg01.iad2.fedoraproject.org - service_description Check fedmsg-hub consumers backlog - check_command check_by_nrpe!check_fedmsg_cbacklog_bugzilla2fedmsg - use defaulttemplate -} +#define service { +# host_name bugzilla2fedmsg01.iad2.fedoraproject.org +# service_description Check fedmsg-hub consumers backlog +# check_command check_by_nrpe!check_fedmsg_cbacklog_bugzilla2fedmsg +# use defaulttemplate +#} define service { host_name fedimg01.iad2.fedoraproject.org diff --git a/roles/nagios_server/templates/nrpe/nrpe.cfg.j2 b/roles/nagios_server/templates/nrpe/nrpe.cfg.j2 index e31505bf33..6ccdbb21d0 100644 --- a/roles/nagios_server/templates/nrpe/nrpe.cfg.j2 +++ b/roles/nagios_server/templates/nrpe/nrpe.cfg.j2 @@ -358,7 +358,6 @@ command[check_datanommer_bodhi_composes]=/usr/lib64/nagios/plugins/check_datanom command[check_datanommer_buildsys]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py buildsys 14400 86400 command[check_datanommer_compose]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py compose 259200 1814400 command[check_datanommer_copr]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py copr 21600 86400 -command[check_datanommer_faf]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py faf 86400 259200 command[check_datanommer_fas]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py fas 1814400 2628000 command[check_datanommer_fedbadges]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py fedbadges 86400 259200 command[check_datanommer_fedimg]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py fedimg 259200 604800 @@ -387,11 +386,10 @@ command[check_fedmsg_cp_app]=/usr/lib64/nagios/plugins/check_fedmsg_producers_co command[check_fedmsg_cp_value]=/usr/lib64/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-irc IRCBotConsumer MonitoringProducer command[check_fedmsg_cp_badges_backend]=/usr/lib64/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub FedoraBadgesConsumer MonitoringProducer command[check_fedmsg_cp_notifs_backend]=/usr/lib64/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub FMNConsumer DigestProducer ConfirmationProducer MonitoringProducer -command[check_fedmsg_cp_bugzilla2fedmsg]=/usr/lib64/nagios/plugins/check_fedmsg_producers_consumers.py moksha-hub BugzillaConsumer MonitoringProducer command[check_fedmsg_cp_fedimg_backend]=/usr/lib64/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub FedimgConsumer MonitoringProducer command[check_fedmsg_cp_hotness_backend]=/usr/lib64/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub BugzillaTicketFiler MonitoringProducer command[check_fedmsg_cp_packages_backend]=/usr/lib64/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub CacheInvalidator MonitoringProducer -command[check_fedmsg_cp_mbs_backend]=/usr/lib64/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub MBSConsumer MBSProducer MonitoringProducer +command[check_fedmsg_cp_mbs_backend]=/usr/lib64/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub MBSConsumer MonitoringProducer command[check_fedmsg_cexceptions_busgateway_hub]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub Nommer 1 10 command[check_fedmsg_cexceptions_busgateway_relay]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-relay RelayConsumer 1 10 @@ -400,7 +398,6 @@ command[check_fedmsg_cexceptions_app]=/usr/lib64/nagios/plugins/check_fedmsg_con command[check_fedmsg_cexceptions_value]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-irc IRCBotConsumer 1 10 command[check_fedmsg_cexceptions_badges_backend]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub FedoraBadgesConsumer 1 10 command[check_fedmsg_cexceptions_notifs_backend]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub FMNConsumer 1 10 -command[check_fedmsg_cexceptions_bugzilla2fedmsg]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_exceptions.py moksha-hub BugzillaConsumer 1 10 command[check_fedmsg_cexceptions_fedimg_backend]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub FedimgConsumer 1 10 command[check_fedmsg_cexceptions_hotness_backend]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub BugzillaTicketFiler 1 10 command[check_fedmsg_cexceptions_packages_backend]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub CacheInvalidator 1 10 @@ -413,7 +410,6 @@ command[check_fedmsg_cbacklog_app]=/usr/lib64/nagios/plugins/check_fedmsg_consum command[check_fedmsg_cbacklog_value]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-irc IRCBotConsumer 10 50 command[check_fedmsg_cbacklog_badges_backend]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub FedoraBadgesConsumer 25000 35000 command[check_fedmsg_cbacklog_notifs_backend]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub FMNConsumer 10 50 -command[check_fedmsg_cbacklog_bugzilla2fedmsg]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_backlog.py moksha-hub BugzillaConsumer 10 100 command[check_fedmsg_cbacklog_fedimg_backend]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub FedimgConsumer 2000 5000 command[check_fedmsg_cbacklog_hotness_backend]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub BugzillaTicketFiler 100 500 command[check_fedmsg_cbacklog_packages_backend_hub]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub CacheInvalidator 30000 40000 diff --git a/roles/notifs/backend/templates/fmn.consumer.py b/roles/notifs/backend/templates/fmn.consumer.py index 6b18b132d8..fbac3c849a 100644 --- a/roles/notifs/backend/templates/fmn.consumer.py +++ b/roles/notifs/backend/templates/fmn.consumer.py @@ -116,15 +116,15 @@ config = { "fmn.email.from_address": "notifications@" + domain, # IRC - "fmn.irc.network": "irc.freenode.net", + "fmn.irc.network": "irc.libera.chat", "fmn.irc.nickname": ircnick, "fmn.irc.timeout": 120, "fmn.irc.port": 6697, "fmn.irc.use_ssl": True, {% if env == 'staging' %} - "fmn.irc.nickserv_pass": "{{fedora_notifstg_freenode_pass}}", + "fmn.irc.nickserv_pass": "{{fedora_notifstg_libera_pass}}", {% else %} - "fmn.irc.nickserv_pass": "{{fedora_notif_freenode_pass}}", + "fmn.irc.nickserv_pass": "{{fedora_notif_libera_pass}}", {% endif %} # Colors: diff --git a/roles/openqa/dispatcher/tasks/main.yml b/roles/openqa/dispatcher/tasks/main.yml index 59f632c895..520a893c5e 100644 --- a/roles/openqa/dispatcher/tasks/main.yml +++ b/roles/openqa/dispatcher/tasks/main.yml @@ -201,7 +201,7 @@ dest: /root/fedora_openqa register: gittools # case of the 'n' seems inconstant, so intentionally omitted - when: "(toolsbranch.stderr.find('ot a git repository') != -1) or (toolsbranch.stdout.find('On branch master') != -1)" + when: "(toolsbranch.stderr.find('ot a git repository') != -1) or (toolsbranch.stdout.find('On branch main') != -1)" - name: Check if fedora_openqa is installed for current Python command: "pip show fedora_openqa" diff --git a/roles/openqa/worker/defaults/main.yml b/roles/openqa/worker/defaults/main.yml index a1dd3494c8..c44923f7e3 100644 --- a/roles/openqa/worker/defaults/main.yml +++ b/roles/openqa/worker/defaults/main.yml @@ -1,6 +1,6 @@ openqa_hostname: localhost openqa_repo: updates -openqa_createhdds_branch: master +openqa_createhdds_branch: main openqa_nfs_worker: false openqa_tap: false openqa_hdds_worker: false diff --git a/roles/openqa/worker/tasks/createhdds.yml b/roles/openqa/worker/tasks/createhdds.yml index f0df315bb6..e4dd5b30b0 100644 --- a/roles/openqa/worker/tasks/createhdds.yml +++ b/roles/openqa/worker/tasks/createhdds.yml @@ -1,7 +1,7 @@ # Required vars with defaults # - openqa_createhdds_branch ## string - The git branch of createhdds to check out -## default - master +## default - main - name: Install required packages package: diff --git a/roles/openshift-apps/bodhi/templates/deploymentconfig.yml b/roles/openshift-apps/bodhi/templates/deploymentconfig.yml index 2696a4446f..ede4c908c6 100644 --- a/roles/openshift-apps/bodhi/templates/deploymentconfig.yml +++ b/roles/openshift-apps/bodhi/templates/deploymentconfig.yml @@ -283,7 +283,7 @@ items: - name: bodhi-celery image: bodhi-base:latest command: ["/usr/bin/celery"] - args: ["worker", "-A", "bodhi.server.tasks.app", "-l", "info", "-Q", "celery"] + args: ["-A", "bodhi.server.tasks.app", "worker", "-l", "info", "-Q", "celery"] resources: {} volumeMounts: - name: config-volume @@ -378,7 +378,7 @@ items: image: bodhi-base:latest workingDir: "/tmp" command: ["/usr/bin/celery"] - args: ["beat", "-A", "bodhi.server.tasks.app", "-l", "info"] + args: ["-A", "bodhi.server.tasks.app", "beat", "-l", "info"] resources: {} volumeMounts: - name: config-volume diff --git a/roles/openshift-apps/bodhi/templates/dockerfile-base b/roles/openshift-apps/bodhi/templates/dockerfile-base index 67aff7af84..ce7ae6435a 100644 --- a/roles/openshift-apps/bodhi/templates/dockerfile-base +++ b/roles/openshift-apps/bodhi/templates/dockerfile-base @@ -1,64 +1,15 @@ FROM fedora:34 LABEL \ - name="bodhi-base" \ - vendor="Fedora Infrastructure" \ - license="MIT" - -RUN curl -o /etc/yum.repos.d/infra-tags.repo https://pagure.io/fedora-infra/ansible/raw/main/f/files/common/fedora-infra-tags.repo - -RUN dnf install -y \ - git \ - python3-pip \ - fedora-messaging \ - httpd \ - intltool \ - origin-clients \ - python3-alembic \ - python3-arrow \ - python3-backoff \ - python3-bleach \ - python3-celery \ - python3-click \ - python3-colander \ - python3-cornice \ - python3-dogpile-cache \ - python3-fedora-messaging \ - python3-feedgen \ - python3-jinja2 \ - python3-markdown \ - python3-psycopg2 \ - python3-prometheus_client \ - python3-py3dns \ - python3-pyasn1-modules \ - python3-pylibravatar \ - python3-pyramid \ - python3-pyramid-fas-openid \ - python3-pyramid-mako \ - python3-pyramid_sawing \ - python3-bugzilla \ - python3-fedora \ - python3-pyyaml \ - python3-simplemediawiki \ - python3-sqlalchemy \ - python3-waitress \ - python3-dnf \ - python3-koji \ - python3-librepo \ - python3-mod_wsgi \ - python3-gunicorn \ - python3-whitenoise \ - && dnf --setopt='tsflags=' install -y bodhi-docs \ - && pip install koji graphene graphene-sqlalchemy WebOb-GraphQL \ - && dnf clean all - -RUN git clone -b {{bodhi_version}} https://github.com/fedora-infra/bodhi.git /srv/bodhi && \ - cd /srv/bodhi && \ - python3 -m pip install . --no-use-pep517 && \ - mkdir -p /usr/share/bodhi && \ - cp /srv/bodhi/apache/bodhi.wsgi /usr/share/bodhi/bodhi.wsgi + name="bodhi-base" \ + vendor="Fedora Infrastructure" \ + license="MIT" +RUN curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/fedora-infra-tags.repo +# While dnf has a --nodocs, it doesen't have a --docs... +RUN sed -i '/nodocs/d' /etc/dnf/dnf.conf +RUN dnf install -y bodhi-server-{{bodhi_version}} bodhi-docs-{{bodhi_version}} python3-pyramid_sawing python3-gunicorn +# Set up krb5 RUN rm -f /etc/krb5.conf && \ ln -sf /etc/bodhi/krb5.conf /etc/krb5.conf && \ - ln -sf /etc/keytabs/koji-keytab /etc/krb5.bodhi_bodhi.fedoraproject.org.keytab - + ln -sf /etc/keytabs/koji-keytab /etc/krb5.bodhi_bodhi{{ env_suffix }}.fedoraproject.org.keytab ENV USER=openshift diff --git a/roles/openshift-apps/bugzilla2fedmsg/templates/fedora-messaging.toml b/roles/openshift-apps/bugzilla2fedmsg/templates/fedora-messaging.toml index 428dcb48a4..3d0bc8e19a 100644 --- a/roles/openshift-apps/bugzilla2fedmsg/templates/fedora-messaging.toml +++ b/roles/openshift-apps/bugzilla2fedmsg/templates/fedora-messaging.toml @@ -27,7 +27,8 @@ certfile = "/etc/pki/fedora-messaging/bugzilla2fedmsg-cert.pem" user = "{{ redhat_dmz_dev_broker_username }}" pass = "{{ redhat_dmz_dev_broker_password }}" {% else %} - uri = "failover:(ssl://messaging-devops-broker01.dist.prod.ext.phx2.redhat.com:61612,ssl://messaging-devops-broker02.dist.prod.ext.phx2.redhat.com:61612)" + #uri = "failover:(ssl://messaging-devops-broker01.dist.prod.ext.phx2.redhat.com:61612,ssl://messaging-devops-broker02.dist.prod.ext.phx2.redhat.com:61612)" + uri = "ssl://messaging-devops-broker01.dist.prod.ext.phx2.redhat.com:61612" user = "{{ redhat_dmz_prod_broker_username }}" pass = "{{ redhat_dmz_prod_broker_password }}" {% endif %} diff --git a/roles/openshift-apps/docsbuilding/templates/cron-translated.yml b/roles/openshift-apps/docsbuilding/templates/cron-translated.yml index 84b924f93e..fc644129d8 100644 --- a/roles/openshift-apps/docsbuilding/templates/cron-translated.yml +++ b/roles/openshift-apps/docsbuilding/templates/cron-translated.yml @@ -24,9 +24,17 @@ spec: - name: build-output mountPath: /antora/output readOnly: false +{% if env == 'staging' %} + - name: build-temp + mountPath: /tmp +{% endif %} restartPolicy: Never startingDeadlineSeconds: 600 volumes: - name: build-output persistentVolumeClaim: claimName: docs-storage +{% if env == 'staging' %} + - name: build-temp + emptyDir: {} +{% endif %} diff --git a/roles/openshift-apps/fedora-packages-static/files/imagestream.yml b/roles/openshift-apps/fedora-packages-static/files/imagestream.yml index b04fcd453e..7ef1338716 100644 --- a/roles/openshift-apps/fedora-packages-static/files/imagestream.yml +++ b/roles/openshift-apps/fedora-packages-static/files/imagestream.yml @@ -8,3 +8,14 @@ spec: local: false status: dockerImageRepository: "" +--- +apiVersion: v1 +kind: ImageStream +metadata: + name: solr +spec: + tags: + - name: "8" + from: + kind: DockerImage + name: solr:8 diff --git a/roles/openshift-apps/fedora-packages-static/files/service.yml b/roles/openshift-apps/fedora-packages-static/files/service.yml index ce64397474..ad30ccf27f 100644 --- a/roles/openshift-apps/fedora-packages-static/files/service.yml +++ b/roles/openshift-apps/fedora-packages-static/files/service.yml @@ -7,10 +7,26 @@ metadata: name: fedora-packages-static spec: ports: - - name: 80-tcp - port: 80 + - name: 8080-tcp + port: 8080 protocol: TCP - targetPort: 80 + targetPort: 8080 selector: app: fedora-packages-static deploymentconfig: fedora-packages-static +--- +apiVersion: v1 +kind: Service +metadata: + labels: + app: fedora-packages-static + name: solr +spec: + ports: + - name: 8983-tcp + port: 8983 + protocol: TCP + targetPort: 8983 + selector: + app: fedora-packages-static + deploymentconfig: solr diff --git a/roles/openshift-apps/fedora-packages-static/templates/configmap.yml b/roles/openshift-apps/fedora-packages-static/templates/configmap.yml index 37044ebf68..0cd8c85dfc 100644 --- a/roles/openshift-apps/fedora-packages-static/templates/configmap.yml +++ b/roles/openshift-apps/fedora-packages-static/templates/configmap.yml @@ -1,3 +1,4 @@ +{% macro load_file(filename) %}{% include filename %}{%- endmacro -%} --- apiVersion: v1 kind: ConfigMap @@ -6,5 +7,27 @@ metadata: labels: app: fedora-packages-static data: - solr-url: "http://solr.solr.svc.cluster.local:8983/" + solr-url: "http://solr.fedora-packages-static.svc.cluster.local:8983/" sitemap-url: "https://packages{{ env_suffix }}.fedoraproject.org" +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: fedora-packages-static-solr-configmap + labels: + app: fedora-packages-static +data: + solrconfig.xml: |- + {{ load_file('packages/solrconfig.xml') | indent }} + schema.xml: |- + {{ load_file('packages/schema.xml') | indent }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: fedora-packages-static-solr-start-configmap + labels: + app: fedora-packages-static +data: + solr-start.sh: |- + {{ load_file('solr-start.sh') | indent }} diff --git a/roles/openshift-apps/fedora-packages-static/templates/deploymentconfig.yml b/roles/openshift-apps/fedora-packages-static/templates/deploymentconfig.yml index a442976270..4104c7babf 100644 --- a/roles/openshift-apps/fedora-packages-static/templates/deploymentconfig.yml +++ b/roles/openshift-apps/fedora-packages-static/templates/deploymentconfig.yml @@ -22,7 +22,7 @@ spec: initContainers: - name: init-solr image: busybox - command: ['sh', '-c', 'until nslookup solr.solr.svc.cluster.local; do echo waiting for solr; sleep 2; done;'] + command: ['sh', '-c', 'until nslookup solr.fedora-packages-static.svc.cluster.local; do echo waiting for solr; sleep 2; done;'] containers: - name: fedora-packages-static image: fedora-packages-static:latest @@ -30,15 +30,15 @@ spec: - name: SOLR_URL valueFrom: configMapKeyRef: - name: fedora-packages-static-configmap + name: fedora-packages-static-configmap key: solr-url - name: SITEMAP_URL valueFrom: configMapKeyRef: - name: fedora-packages-static-configmap + name: fedora-packages-static-configmap key: sitemap-url ports: - - containerPort: 80 + - containerPort: 8080 resources: {} volumeMounts: - name: data-volume @@ -51,13 +51,13 @@ spec: initialDelaySeconds: 600 httpGet: path: / - port: 80 + port: 8080 livenessProbe: timeoutSeconds: 1 initialDelaySeconds: 630 httpGet: path: / - port: 80 + port: 8080 volumes: - name: data-volume persistentVolumeClaim: @@ -76,3 +76,69 @@ spec: from: kind: ImageStreamTag name: fedora-packages-static:latest +--- +apiVersion: v1 +kind: DeploymentConfig +metadata: + labels: + app: fedora-packages-static + service: solr + name: solr +spec: + replicas: 1 # Only 1! Solr is not configured in cloud mode yet. + selector: + app: fedora-packages-static + deploymentconfig: fedora-packages-static + strategy: + type: Rolling + template: + metadata: + labels: + app: fedora-packages-static + deploymentconfig: fedora-packages-static + spec: + containers: + - name: solr + image: solr:8 + command: + - bash + - /opt/solr-start/solr-start.sh + ports: + - containerPort: 8983 + resources: {} + volumeMounts: + - name: data-volume + mountPath: /var/solr + - name: config-volume + mountPath: /opt/solr/server/solr/configsets/packages + readOnly: true + - name: script-volume + mountPath: /opt/solr-start + readinessProbe: + timeoutSeconds: 1 + initialDelaySeconds: 30 + httpGet: + path: / + port: 8983 + livenessProbe: + timeoutSeconds: 1 + initialDelaySeconds: 40 + httpGet: + path: / + port: 8983 + # Add solr's default gid to nfs group + securityContext: + supplementalGroups: [8983] + volumes: + - name: data-volume + persistentVolumeClaim: + claimName: solr-storage{{ '-stg' if env == 'staging' else '' }} + - name: config-volume + configMap: + name: fedora-packages-static-solr-configmap + - name: script-volume + configMap: + name: fedora-packages-static-solr-start-configmap + + triggers: + - type: ConfigChange diff --git a/roles/openshift-apps/solr/templates/packages/schema.xml b/roles/openshift-apps/fedora-packages-static/templates/packages/schema.xml similarity index 100% rename from roles/openshift-apps/solr/templates/packages/schema.xml rename to roles/openshift-apps/fedora-packages-static/templates/packages/schema.xml diff --git a/roles/openshift-apps/solr/templates/packages/solrconfig.xml b/roles/openshift-apps/fedora-packages-static/templates/packages/solrconfig.xml similarity index 99% rename from roles/openshift-apps/solr/templates/packages/solrconfig.xml rename to roles/openshift-apps/fedora-packages-static/templates/packages/solrconfig.xml index 0fc3f8b6cb..f87a30319f 100644 --- a/roles/openshift-apps/solr/templates/packages/solrconfig.xml +++ b/roles/openshift-apps/fedora-packages-static/templates/packages/solrconfig.xml @@ -368,11 +368,11 @@ - +