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

inventory/host_vars/odcs-backend01.iad2.fedoraproject.org

@@ -0,0 +1,16 @@
+---
+nm: 255.255.255.0
+gw: 10.3.169.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/
+
+eth0_ip: 10.3.169.110
+
+volgroup: /dev/vg_guests
+vmhost: bvmhost-x86-03.iad2.fedoraproject.org
+
+datacenter: iad2
+
+virt_install_command: "{{ virt_install_command_one_nic }}"

inventory/host_vars/odcs-frontend01.iad2.fedoraproject.org

@@ -0,0 +1,16 @@
+---
+nm: 255.255.255.0
+gw: 10.3.169.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/
+
+eth0_ip: 10.3.169.111
+
+volgroup: /dev/vg_guests
+vmhost: bvmhost-x86-04.iad2.fedoraproject.org
+
+datacenter: iad2
+
+virt_install_command: "{{ virt_install_command_one_nic }}"

inventory/inventory

@@ -488,6 +488,7 @@ ns05.fedoraproject.org
 
 [odcs_frontend]
 odcs-frontend01.phx2.fedoraproject.org
+odcs-frontend01.iad2.fedoraproject.org
 
 [odcs_frontend_stg]
 odcs-frontend01.stg.phx2.fedoraproject.org
@@ -498,6 +499,7 @@ odcs_backend_releng
 
 [odcs_backend_general]
 odcs-backend01.phx2.fedoraproject.org
+odcs-backend01.iad2.fedoraproject.org
 
 [odcs_backend_releng]
 odcs-backend-releng01.phx2.fedoraproject.org
@@ -1334,6 +1336,8 @@ mm-crawler01.iad2.fedoraproject.org
 noc01.iad2.fedoraproject.org
 ns01.iad2.fedoraproject.org
 ns02.iad2.fedoraproject.org
+odcs-frontend01.iad2.fedoraproject.org
+odcs-backend01.iad2.fedoraproject.org
 oci-registry01.iad2.fedoraproject.org
 oci-candidate-registry01.iad2.fedoraproject.org
 osbs-control01.iad2.fedoraproject.org

roles/bodhi2/backend/files/koji-sync-listener.py

@@ -23,7 +23,7 @@ def handle(content):
     sys.stdout.flush()
     # XXX If you modify this taglist.  Please also modify the other copy in
     # bodhi2/backend/tasks/main.yml
-    taglist = 'f33 f33-container f33-modular f33-flatpak f32 f32-container f32-modular f32-flatpak f31 f31-container f31-flatpak f31-modular f30 f30-container f30-flatpak f30-modular epel8 epel8-playground epel8-modular epel7 dist-6E-epel module-package-list modular'
+    taglist = 'f33 f33-container f33-modular f33-flatpak f32 f32-container f32-modular f32-flatpak f31 f31-container f31-flatpak f31-modular epel8 epel8-playground epel8-modular epel7 dist-6E-epel module-package-list modular'
     cmd = [
         '/usr/local/bin/owner-sync-pagure',
         '--package', package,

roles/bodhi2/backend/files/new-updates-sync

@@ -108,48 +108,6 @@ RELEASES = {'f32': {'topic': 'fedora',
                                 'dest': os.path.join(FEDORAALTDEST, 'testing', '31', 'Modular')}
                               ]}}
                    },
-             'f30': {'topic': 'fedora',
-                    'version': '30',
-                    'modules': ['fedora', 'fedora-secondary'],
-                    'repos': {'updates': {
-                        'from': 'f30-updates',
-                        'ostrees': [{'ref': 'fedora/30/x86_64/updates/silverblue',
-                                     'dest': OSTREEDEST}],
-                        'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'],
-                                'dest': os.path.join(FEDORADEST, '30', 'Everything')},
-                               {'arches': ['i386', 'ppc64le', 's390x'],
-                                'dest': os.path.join(FEDORAALTDEST, '30', 'Everything')}
-                              ]},
-                              'updates-testing': {
-                        'from': 'f30-updates-testing',
-                        'ostrees': [{'ref': 'fedora/30/x86_64/testing/silverblue',
-                                     'dest': OSTREEDEST}],
-                        'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
-                                'dest': os.path.join(FEDORADEST, 'testing', '30', 'Everything')},
-                               {'arches': ['i386', 'ppc64le', 's390x'],
-                                'dest': os.path.join(FEDORAALTDEST, 'testing', '30', 'Everything')}
-                              ]}}
-                   },
-            'f30m': {'topic': 'fedora',
-                    'version': '30m',
-                    'modules': ['fedora', 'fedora-secondary'],
-                    'repos': {'updates': {
-                        'from': 'f30-modular-updates',
-                        'ostrees': [],
-                        'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
-                                'dest': os.path.join(FEDORADEST, '30', 'Modular')},
-                               {'arches': ['i386', 'ppc64le', 's390x'],
-                                'dest': os.path.join(FEDORAALTDEST, '30', 'Modular')}
-                              ]},
-                              'updates-testing': {
-                        'from': 'f30-modular-updates-testing',
-                        'ostrees': [],
-                        'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
-                                'dest': os.path.join(FEDORADEST, 'testing', '30', 'Modular')},
-                               {'arches': ['i386', 'ppc64le', 's390x'],
-                                'dest': os.path.join(FEDORAALTDEST, 'testing', '30', 'Modular')}
-                              ]}}
-                   },
             'epel8': {'topic': 'epel',
                       'version': '8',
                       'modules': ['epel'],

roles/bodhi2/backend/tasks/main.yml

@@ -73,7 +73,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 f33 f33-container f33-modular f33-flatpak f32 f32-container f32-modular f32-flatpak f31 f31-container f31-flatpak f31-modular f30 f30-container f30-flatpak f30-modular epel8 epel8-playground epel8-modular epel7 dist-6E-epel module-package-list modular'"
+      job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f33 f33-container f33-modular f33-flatpak f32 f32-container f32-modular f32-flatpak f31 f31-container f31-flatpak f31-modular epel8 epel8-playground epel8-modular epel7 dist-6E-epel module-package-list modular'"
       cron_file=update-koji-owner
   when: env == "production"
   tags:

roles/copr/backend/templates/resalloc/vm-aws-new

@@ -1,6 +1,7 @@
 #! /usr/bin/bash
 
 set -e
+set -o pipefail
 
 delete_script=$(readlink -f "$(dirname "$0")")/vm-aws-delete
 

roles/ipa/server/tasks/main.yml

@@ -63,7 +63,6 @@
   delegate_to: ipa01.phx2.fedoraproject.org
   command: ipa-replica-prepare
            --password={{ipa_dm_password}}
-           --ip-address={{eth0_ip}}
            {{inventory_hostname}}
            creates=/var/lib/ipa/replica-info-{{inventory_hostname}}.gpg
   tags:

roles/mbs/common/files/default-modules.production/platform-f30.yaml

@@ -1,28 +0,0 @@
-data:
-  description: Fedora 30 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: f30
-  summary: Fedora 30 traditional base
-  context: 00000000
-  version: 6 
-  xmd:
-    mbs:
-      buildrequires: {}
-      commit: f30
-      requires: {}
-      koji_tag: module-f30-build
-      mse: TRUE
-      virtual_streams: [fedora]
-document: modulemd
-version: 1
-

roles/openvpn/server/files/ccd/proxy10.iad2.fedoraproject.org

@@ -0,0 +1,2 @@
+# ifconfig-push actualIP PtPIP
+ifconfig-push 192.168.1.17 192.168.0.17

roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json

@@ -41,7 +41,7 @@
       "dist_tag": ".fc30",
       "koji_name": "f30",
       "name": "Fedora",
-      "status": "Active",
+      "status": "EOL",
       "version": "30"
     },
     {

roles/releng/files/cloud-updates

@@ -1,6 +1,6 @@
 #Fedora 30 Cloud nightly compose
-MAILTO=releng-cron@lists.fedoraproject.org
+#MAILTO=releng-cron@lists.fedoraproject.org
-15 6 * * * root TMPDIR=`mktemp -d /tmp/CloudF30.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f30 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR
+#15 6 * * * root TMPDIR=`mktemp -d /tmp/CloudF30.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f30 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR
 
 #Fedora 32 Cloud nightly compose
 MAILTO=releng-cron@lists.fedoraproject.org

roles/releng/files/container-updates

@@ -3,8 +3,8 @@ MAILTO=releng-cron@lists.fedoraproject.org
 45 5 * * * root TMPDIR=`mktemp -d /tmp/containerF31.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f31 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR
 
 # Fedora 30 Container Updates nightly compose
-MAILTO=releng-cron@lists.fedoraproject.org
+#MAILTO=releng-cron@lists.fedoraproject.org
-45 7 * * * root TMPDIR=`mktemp -d /tmp/containerF30.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f30 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR
+#45 7 * * * root TMPDIR=`mktemp -d /tmp/containerF30.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f30 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR
 
 # Fedora 32 Container Updates nightly compose
 MAILTO=releng-cron@lists.fedoraproject.org

roles/totpcgi/templates/configmap.yml

@@ -105,8 +105,10 @@ data:
         ServerName fas-all.stg.phx2.fedoraproject.org:8443
 {% elif objectname == "configmap-totpcgi-vpn.yml" %}
         ServerName fas-all.vpn.fedoraproject.org:8443
-{% else %}
+{% elif datacenter == 'phx2' %}
         ServerName fas-all.phx2.fedoraproject.org:8443
+{% elif datacenter == 'iad2' %}
+        ServerName fas-all.iad2.fedoraproject.org:8443
 {% endif %}
         SSLEngine on
 {% if objectname == "configmap-totpcgi-vpn.yml" %}

roles/totpcgi/templates/provisioning.conf.j2

@@ -67,11 +67,11 @@ makedb = True
 
 ; For PostgreSQL backend:
 engine = pgsql
-pg_connect_string = user={{ totpcgiadminDBUser }} password={{ totpcgiadminDBPassword }} host=db-fas01{{ env_suffix }}.phx2.fedoraproject.org dbname=totpcgi
+pg_connect_string = user={{ totpcgiadminDBUser }} password={{ totpcgiadminDBPassword }} host=db-fas01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org dbname=totpcgi
 
 [pincode_backend]
 engine = pgsql
-pg_connect_string = user={{ totpcgiadminDBUser }} password={{ totpcgiadminDBPassword }} host=db-fas01{{ env_suffix }}.phx2.fedoraproject.org dbname=totpcgi
+pg_connect_string = user={{ totpcgiadminDBUser }} password={{ totpcgiadminDBPassword }} host=db-fas01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org dbname=totpcgi
 
 ; For LDAP backend (simple bind auth):
 ;engine = ldap
@@ -85,4 +85,4 @@ pg_connect_string = user={{ totpcgiadminDBUser }} password={{ totpcgiadminDBPass
 
 ; For PostgreSQL backend:
 engine = pgsql
-pg_connect_string = user={{ totpcgiadminDBUser }} password={{ totpcgiadminDBPassword }} host=db-fas01{{ env_suffix }}.phx2.fedoraproject.org dbname=totpcgi
+pg_connect_string = user={{ totpcgiadminDBUser }} password={{ totpcgiadminDBPassword }} host=db-fas01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org dbname=totpcgi

roles/totpcgi/templates/totpcgi-httpd.conf.j2

@@ -5,7 +5,11 @@ Listen 8443
 
 	ServerAdmin admin@fedoraproject.org
 	DocumentRoot /var/www/totpcgi
+{% if datacenter == 'phx2' %}
 	ServerName fas-all.phx2.fedoraproject.org:8443
+{% elif datacenter == 'iad2' %}
+	ServerName fas-all.iad2.fedoraproject.org:8443
+{% endif %}
 	ErrorLog /var/log/httpd/totpcgi-error.log
 	SuexecUserGroup totpcgi totpcgi
 

roles/totpcgi/templates/totpcgi.conf.j2

@@ -10,11 +10,11 @@ fas_url = https://admin.fedoraproject.org/accounts/
 [secret_backend]
 ; For PostgreSQL backend:
 engine = pgsql
-pg_connect_string = user={{ totpcgiDBUser }} password={{ totpcgiDBPassword }} host=db-fas01{{ env_suffix }}.phx2.fedoraproject.org dbname=totpcgi
+pg_connect_string = user={{ totpcgiDBUser }} password={{ totpcgiDBPassword }} host=db-fas01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org dbname=totpcgi
 
 [pincode_backend]
 engine = pgsql
-pg_connect_string = user={{ totpcgiDBUser }} password={{ totpcgiDBPassword }} host=db-fas01{{ env_suffix }}.phx2.fedoraproject.org dbname=totpcgi
+pg_connect_string = user={{ totpcgiDBUser }} password={{ totpcgiDBPassword }} host=db-fas01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org dbname=totpcgi
 
 ; For LDAP backend (simple bind auth):
 ;engine = ldap
@@ -28,4 +28,4 @@ pg_connect_string = user={{ totpcgiDBUser }} password={{ totpcgiDBPassword }} ho
 
 ; For PostgreSQL backend:
 engine = pgsql
-pg_connect_string = user={{ totpcgiDBUser }} password={{ totpcgiDBPassword }} host=db-fas01{{ env_suffix }}.phx2.fedoraproject.org dbname=totpcgi
+pg_connect_string = user={{ totpcgiDBUser }} password={{ totpcgiDBPassword }} host=db-fas01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org dbname=totpcgi

roles/yubikey/templates/ykksm-config.php

@@ -1,5 +1,5 @@
 <?php
-$db_dsn      = "pgsql:dbname=ykksm;host=db-fas01{{ env_suffix }}.phx2.fedoraproject.org";
+$db_dsn      = "pgsql:dbname=ykksm;host=db-fas01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org";
 $db_username = "ykksmreader";
 $db_password = "{{ ykksmreaderPassword }}";
 $db_options  = array();

roles/yubikey/templates/ykval-config.php

@@ -2,7 +2,7 @@
 
 # For the validation interface.
 $baseParams = array ();
-$baseParams['__YKVAL_DB_DSN__'] = "pgsql:dbname=ykval;host=db-fas01{{ env_suffix }}.phx2.fedoraproject.org";
+$baseParams['__YKVAL_DB_DSN__'] = "pgsql:dbname=ykval;host=db-fas01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org";
 $baseParams['__YKVAL_DB_USER__'] = 'ykval_verifier';
 $baseParams['__YKVAL_DB_PW__'] = '{{ ykvalDBPassword }}';
 $baseParams['__YKVAL_DB_OPTIONS__'] = array();