From 6c24e3212adac6fb4f2658ce7469b0e6ca6a0069 Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Thu, 17 Dec 2015 15:52:05 +0000 Subject: [PATCH 01/32] fixing buildslave ssh pubkey for taskotron-dev --- inventory/group_vars/taskotron-dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev index cc8ca1d586..3514647f0e 100644 --- a/inventory/group_vars/taskotron-dev +++ b/inventory/group_vars/taskotron-dev @@ -67,4 +67,4 @@ buildmaster_template: taskotron.master.cfg.j2 buildmaster_user: buildmaster buildslave_port: 9989 -buildslave_ssh_pubkey: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqNpJlS14KKQQ8gAaXo0untJRccLJSrdUt/hWlpZ9Oad5KKYoRNznsGK3j9WCO4YDFXKGGxBrpqdyegPLO4J9zHmtlUPNfM4kbXVlVtIMGGKmBi9rQPNRpeclUpsjlo3uF9IqIIUSS1IMcx1X1oz60kmrAWO9+Z7mYs/AuCCeomlET3OU7paQYxL5Dgs2n6/IjhvoCitN9T9bBf91nLuRh+EtEbBL5ztZ1kVJxj5oTQN7iGKw2V0tW0MJ1WtnK2/j4v9MivnZPSPPKDysveNze2Vy9kioQACvrvjyHMIQrc+2YS/38D/fv7e4WhhuoOGT5Tip20PPspiCQRiSUBDN1 buildslave@taskotron-stg.fedoraproject.org' +buildslave_ssh_pubkey: 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA4EOTNfPIvIjCLNRYauVquS2LA8CZvCi6f87TASDZv4moFTv3mrCIdA3ycYLg+r+ODdPDjF9Cjpw1os/8L07XegTt9gAJVIpxzu3ZgQDkSQbx/hlDi+RG4EOIHL8nNJmu27dOVd1tb3k3aOkP5twO4uEq9RygrQBWMZTmOHdS/q8ZVUQG0d1sKv2J8EuBENgICjjIhhYvdvluu3G65jKxMgDbSXjkK6vZpbDbS2d6JI3VeLbVGlyFbHkTu7vH/vzTJZfOYgp0ZbvW9Wo3VSq/ia5qtrLKwRcBkpyCkP6uOQ14zqj4zJd/Hv7qhEcUhC8Jsb7d/Z6b3q5ID0s/9nuHdQ== tflink@lockbox01.phx2.fedoraproject.org' From 3f881b3d22985f5c153c98ab03264eaeb9559a7c Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Thu, 17 Dec 2015 16:53:19 +0100 Subject: [PATCH 02/32] Check that the directory is a directory --- roles/cgit/make_pkgs_list/files/make-cgit-pkgs-list.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/cgit/make_pkgs_list/files/make-cgit-pkgs-list.sh b/roles/cgit/make_pkgs_list/files/make-cgit-pkgs-list.sh index 4d588bde93..1686e568b2 100644 --- a/roles/cgit/make_pkgs_list/files/make-cgit-pkgs-list.sh +++ b/roles/cgit/make_pkgs_list/files/make-cgit-pkgs-list.sh @@ -10,7 +10,7 @@ newfile=`mktemp` ls > $newfile cd /srv/git/repositories/ for d in `ls`; do - if [ ! -L $d ]; then + if [ ! -L $d ] && [ -d $d ]; then for f in `ls $d`; do echo $d/$f >> $newfile; done; From c6783d0391791bf501593e878cacc08d5477e05e Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 17 Dec 2015 16:01:42 +0000 Subject: [PATCH 03/32] Install mirrormanager2-statistics on the backend Signed-off-by: Adrian Reber --- roles/mirrormanager/backend/tasks/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/mirrormanager/backend/tasks/main.yml b/roles/mirrormanager/backend/tasks/main.yml index f6daabfe12..70258f67e0 100644 --- a/roles/mirrormanager/backend/tasks/main.yml +++ b/roles/mirrormanager/backend/tasks/main.yml @@ -10,9 +10,11 @@ yum: pkg={{ item }} state=present with_items: - mirrormanager2-backend + - mirrormanager2-statistics - bzip2 - python-psycopg2 - fedmsg + - jq tags: - packages From 8d70839c020e2709dd96da54dcce56ab07f43a43 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 17 Dec 2015 16:13:12 +0000 Subject: [PATCH 04/32] A stab at fixing the make-cgit list script. --- .../make_pkgs_list/files/make-cgit-pkgs-list.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/roles/cgit/make_pkgs_list/files/make-cgit-pkgs-list.sh b/roles/cgit/make_pkgs_list/files/make-cgit-pkgs-list.sh index 1686e568b2..8985ae1164 100644 --- a/roles/cgit/make_pkgs_list/files/make-cgit-pkgs-list.sh +++ b/roles/cgit/make_pkgs_list/files/make-cgit-pkgs-list.sh @@ -6,16 +6,17 @@ # Looking for git repos. # newfile=`mktemp` +target=/srv/git/repositories -ls > $newfile -cd /srv/git/repositories/ -for d in `ls`; do - if [ ! -L $d ] && [ -d $d ]; then - for f in `ls $d`; do - echo $d/$f >> $newfile; +ls $target > $newfile +for d in `ls $target`; do + if [ ! -L $target/$d ] && [ -d $target/$d ]; then + for f in `ls $target/$d/`; do + echo "$d/$f" >> $newfile; done; fi; done; + mv -Z $newfile /srv/git/pkgs-git-repos-list chown apache:apache /srv/git/pkgs-git-repos-list chmod 644 /srv/git/pkgs-git-repos-list From 5115cb60009aa83e0bc112542b5a24ad7eac4e35 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 17 Dec 2015 16:24:42 +0000 Subject: [PATCH 05/32] Add mirrormanager public key to frontends to transfer statistics results Signed-off-by: Adrian Reber --- roles/mirrormanager/frontend2/tasks/main.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/roles/mirrormanager/frontend2/tasks/main.yml b/roles/mirrormanager/frontend2/tasks/main.yml index 01d222713b..3ad8c94c78 100644 --- a/roles/mirrormanager/frontend2/tasks/main.yml +++ b/roles/mirrormanager/frontend2/tasks/main.yml @@ -103,3 +103,11 @@ - config - mm2_frontend when: env != "staging" + +# mirrormanager user ssh key(s) (used to transfer statistics from backend to frontends) +- name: add authorized_keys for mirrormanager + authorized_key: key="{{ item }}" user=mirrormanager state=present + with_file: + - {{ roles }}/mirrormanager/mirrorlist2/files/mm-authorized_key + tags: + - mm2_frontend From a9c6815e164f61765d4fab5234bd00495f279b40 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 17 Dec 2015 16:30:38 +0000 Subject: [PATCH 06/32] Missing quotes --- roles/mirrormanager/frontend2/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mirrormanager/frontend2/tasks/main.yml b/roles/mirrormanager/frontend2/tasks/main.yml index 3ad8c94c78..c4bcc599fe 100644 --- a/roles/mirrormanager/frontend2/tasks/main.yml +++ b/roles/mirrormanager/frontend2/tasks/main.yml @@ -108,6 +108,6 @@ - name: add authorized_keys for mirrormanager authorized_key: key="{{ item }}" user=mirrormanager state=present with_file: - - {{ roles }}/mirrormanager/mirrorlist2/files/mm-authorized_key + - "{{ roles }}/mirrormanager/mirrorlist2/files/mm-authorized_key" tags: - mm2_frontend From 26141bb5e01e121233498254d5b18ec1305ca87d Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 17 Dec 2015 16:37:04 +0000 Subject: [PATCH 07/32] Fix GIT_FOLDER for prod. --- roles/distgit/templates/pkgdb_sync_git_branches.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/roles/distgit/templates/pkgdb_sync_git_branches.py b/roles/distgit/templates/pkgdb_sync_git_branches.py index 92fa5ec4b4..24d15f2b20 100644 --- a/roles/distgit/templates/pkgdb_sync_git_branches.py +++ b/roles/distgit/templates/pkgdb_sync_git_branches.py @@ -63,11 +63,10 @@ fedmsg.init(name='relay_inbound', cert_prefix='shell', **config) {% if env == 'staging' -%} PKGDB_URL = 'https://admin.stg.fedoraproject.org/pkgdb' -GIT_FOLDER = '/srv/git/repositories/' {%- else -%} PKGDB_URL = 'https://admin.fedoraproject.org/pkgdb' -GIT_FOLDER = '/srv/git/rpms/' {%- endif %} +GIT_FOLDER = '/srv/git/repositories/' MKBRANCH = '/usr/local/bin/mkbranch' SETUP_PACKAGE = '/usr/local/bin/setup_git_package' From 1dff3ce6550a5065084364cc177808c5f6d8a28d Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Thu, 17 Dec 2015 17:44:49 +0100 Subject: [PATCH 08/32] Fix symlinking the new repo to the old location --- roles/distgit/templates/pkgdb_sync_git_branches.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/roles/distgit/templates/pkgdb_sync_git_branches.py b/roles/distgit/templates/pkgdb_sync_git_branches.py index 24d15f2b20..d47e6200a3 100644 --- a/roles/distgit/templates/pkgdb_sync_git_branches.py +++ b/roles/distgit/templates/pkgdb_sync_git_branches.py @@ -212,14 +212,15 @@ def branch_package(ns, pkgname, requested_branches, existing_branches): print 'Fixing package %s for branches %s' % (pkgname, requested_branches) # Create the devel branch if necessary - exists = os.path.exists(os.path.join(GIT_FOLDER, ns, '%s.git' % pkgname)) + new_place = os.path.join(GIT_FOLDER, ns, '%s.git' % pkgname) + exists = os.path.exists(new_place) if not exists or 'master' not in existing_branches: if not TEST_ONLY: _invoke(SETUP_PACKAGE, [os.path.join(ns, pkgname)]) if ns == 'rpms': - old_place = os.path.exists(os.path.join( - GIT_FOLDER, '%s.git' % pkgname)) - os.symlink(exists, old_place) + old_place = os.path.join( + GIT_FOLDER, '%s.git' % pkgname) + os.symlink(new_place, old_place) # SETUP_PACKAGE creates master if 'master' in requested_branches: requested_branches.remove('master') From 8a58b9049a63a8658d417afe62c53a35683b57bf Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Thu, 17 Dec 2015 17:45:31 +0100 Subject: [PATCH 09/32] Style --- roles/distgit/templates/pkgdb_sync_git_branches.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/roles/distgit/templates/pkgdb_sync_git_branches.py b/roles/distgit/templates/pkgdb_sync_git_branches.py index d47e6200a3..cf8fa5b518 100644 --- a/roles/distgit/templates/pkgdb_sync_git_branches.py +++ b/roles/distgit/templates/pkgdb_sync_git_branches.py @@ -218,8 +218,7 @@ def branch_package(ns, pkgname, requested_branches, existing_branches): if not TEST_ONLY: _invoke(SETUP_PACKAGE, [os.path.join(ns, pkgname)]) if ns == 'rpms': - old_place = os.path.join( - GIT_FOLDER, '%s.git' % pkgname) + old_place = os.path.join(GIT_FOLDER, '%s.git' % pkgname) os.symlink(new_place, old_place) # SETUP_PACKAGE creates master if 'master' in requested_branches: From d0639e74d2623a4233610968e90590ab9412458e Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Thu, 17 Dec 2015 17:46:54 +0100 Subject: [PATCH 10/32] Needs some space otherwise endup in the same line --- roles/distgit/templates/pkgdb_sync_git_branches.py | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/distgit/templates/pkgdb_sync_git_branches.py b/roles/distgit/templates/pkgdb_sync_git_branches.py index cf8fa5b518..60170a6158 100644 --- a/roles/distgit/templates/pkgdb_sync_git_branches.py +++ b/roles/distgit/templates/pkgdb_sync_git_branches.py @@ -66,6 +66,7 @@ PKGDB_URL = 'https://admin.stg.fedoraproject.org/pkgdb' {%- else -%} PKGDB_URL = 'https://admin.fedoraproject.org/pkgdb' {%- endif %} + GIT_FOLDER = '/srv/git/repositories/' MKBRANCH = '/usr/local/bin/mkbranch' From 9a18aecaae6fd503681248a3332778d889d6ca2c Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 17 Dec 2015 16:52:33 +0000 Subject: [PATCH 11/32] Change the MM public key to user_home_t Signed-off-by: Adrian Reber --- roles/mirrormanager/frontend2/tasks/main.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/roles/mirrormanager/frontend2/tasks/main.yml b/roles/mirrormanager/frontend2/tasks/main.yml index c4bcc599fe..4b4c5e03a9 100644 --- a/roles/mirrormanager/frontend2/tasks/main.yml +++ b/roles/mirrormanager/frontend2/tasks/main.yml @@ -111,3 +111,10 @@ - "{{ roles }}/mirrormanager/mirrorlist2/files/mm-authorized_key" tags: - mm2_frontend + +- name: apply selinux type to mirrormanager public_key + file: dest=/var/lib/mirrormanager/.ssh/authorized_keys setype=user_home_t state=file + tags: + - mm2_frontend + - config + From 7ceec9fbd01e940d13bd6b1b44caf4cc3b97fb61 Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Thu, 17 Dec 2015 17:06:36 +0000 Subject: [PATCH 12/32] buildmaster dev pub key changed back to rsa --- inventory/group_vars/taskotron-dev-client-hosts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/group_vars/taskotron-dev-client-hosts b/inventory/group_vars/taskotron-dev-client-hosts index 8d45667221..635600b7d7 100644 --- a/inventory/group_vars/taskotron-dev-client-hosts +++ b/inventory/group_vars/taskotron-dev-client-hosts @@ -60,4 +60,4 @@ buildslave_pubkey: "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA4EOTNfPIvIjCLNRYauVquS2L buildslave_private_sshkey_file: dev-buildslave-sshkey/dev_buildslave buildslave_public_sshkey_file: dev-buildslave-sshkey/dev_buildslave.pub -buildmaster_pubkey: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKuTcq0M1Lkc/G0fJYxyjCPcHuHSqDne0+FZAPhNov8gjo1ZV68V+aP60h3FzNS6l89nltndYuYI36ed0KXpqVo=" +buildmaster_pubkey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDYzVmGYh6EHH8UAlgX6FIOJGHsq/63G4ryMC7VgLIwIhp+SloqMtLeQvZ2COzF+ycatlG1reY6+x0lXBlt72jyInnHy3pOKByOQPkMOS6zOLGnK1zWKjsexabgIXUKAM/dEsMJRBvVK4ZnlClZ0ol3+pqjbzT619vEiGZhUIkOXvptKVPkBFAdpiB/ehd2nqESOWa1ZId9ney4LZt7b/5krCY8RTYWQbGWvcndy6L4rRfqkfvW9t9HS6zyQfLouXCwW8QS5nTqY/kmtfse+7D6Ne+IySmaSX/kWB3YlhVOxB2DTP0pE3ZkXMJ4u04i4stySYxkajoonxAc8SUI4Djl" From 6cc6e4417e52f0533b75fcf6f1359d5e06729036 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 17 Dec 2015 17:11:28 +0000 Subject: [PATCH 13/32] Enable propagation diagrams in MM2 Signed-off-by: Adrian Reber --- roles/mirrormanager/backend/tasks/main.yml | 12 +++++-- .../backend/templates/handle_propagation.sh | 32 +++++++++++++++++++ roles/mirrormanager/frontend2/tasks/main.yml | 2 +- .../frontend2/templates/mirrormanager2.cfg | 2 +- 4 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 roles/mirrormanager/backend/templates/handle_propagation.sh diff --git a/roles/mirrormanager/backend/tasks/main.yml b/roles/mirrormanager/backend/tasks/main.yml index 70258f67e0..8b817af880 100644 --- a/roles/mirrormanager/backend/tasks/main.yml +++ b/roles/mirrormanager/backend/tasks/main.yml @@ -50,8 +50,16 @@ - name: install the umdl-required logrotate file copy: src=mm2_umdl-required.logrotate dest=/etc/logrotate.d/mm2_umdl-required mode=644 -- name: install sync to mirrorlist servers script - template: src=sync_pkl_to_mirrorlists.sh dest=/usr/local/bin/sync_pkl_to_mirrorlists.sh mode=0755 +- name: install backend helper scripts + template: src={{ item }} dest=/usr/local/bin/{{ item }} mode=0755 + with_items: + - sync_pkl_to_mirrorlists.sh + - handle_propagation.sh + +- name: handle propagation cronjob + cron: name="handle-propagation" minute="25,55" hour="*" user="mirrormanager" + job="/usr/local/bin/handle_propagation.sh" + cron_file=handle-propagation - name: setup /var/lib/mirrormanager/.ssh directory copy: > diff --git a/roles/mirrormanager/backend/templates/handle_propagation.sh b/roles/mirrormanager/backend/templates/handle_propagation.sh new file mode 100644 index 0000000000..877f109338 --- /dev/null +++ b/roles/mirrormanager/backend/templates/handle_propagation.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +URL="https://admin.fedoraproject.org/pkgdb/api/collections/f*/?clt_status=Active" +PROPAGATION="/usr/bin/mm2_propagation" +SOURCE="mm-crawler01.phx2.fedoraproject.org::propagation" +LOGBASE="/var/log/mirrormanager/propagation" + +FRONTENDS="{% for host in groups['mm-frontend'] %} {{ host }} {% endfor %}" + +OUTPUT=`mktemp -d` +ACTIVE=`mktemp` + +trap "rm -f ${OUTPUT}/*; rmdir ${OUTPUT}; rm -f ${ACTIVE}" QUIT TERM INT HUP EXIT + +rsync -aq --delete ${SOURCE} ${LOGBASE} + +curl -s ${URL} >> ${ACTIVE} + +if [ $? -ne 0 ]; then + echo "PROPAGATION: Querying the active collections failed. Exiting!" + exit 1 +fi + +for version in `jq -r ".collections[$i].version" < ${ACTIVE}`; do + ${PROPAGATION} --outdir ${OUTPUT} --logfiles "${LOGBASE}/f${version}*" --prefix ${version}_updates +done + +${PROPAGATION} --outdir ${OUTPUT} --logfiles "${LOGBASE}/development*" + +for f in ${FRONTENDS}; do + rsync -aq ${OUTPUT}/*[st]-repomd-propagation.svg ${f}:/var/www/mirrormanager-statistics/data/propagation +done diff --git a/roles/mirrormanager/frontend2/tasks/main.yml b/roles/mirrormanager/frontend2/tasks/main.yml index 4b4c5e03a9..68497d3e81 100644 --- a/roles/mirrormanager/frontend2/tasks/main.yml +++ b/roles/mirrormanager/frontend2/tasks/main.yml @@ -57,7 +57,7 @@ - config - name: Create mirrormanager user - user: name=mirrormanager state=present home=/var/lib/mirrormanager createhome=yes shell=/sbin/nologin + user: name=mirrormanager state=present home=/var/lib/mirrormanager createhome=yes shell=/bin/bash tags: - mm2_frontend - config diff --git a/roles/mirrormanager/frontend2/templates/mirrormanager2.cfg b/roles/mirrormanager/frontend2/templates/mirrormanager2.cfg index 5dfdd52481..bcc3288af2 100644 --- a/roles/mirrormanager/frontend2/templates/mirrormanager2.cfg +++ b/roles/mirrormanager/frontend2/templates/mirrormanager2.cfg @@ -97,7 +97,7 @@ INTERACTIVE_MAP = '/map/mirrors.html' # The crawler can generate propagation statistics which can be # converted into svg/pdf with mm2_propagation. These files # can be displayed next to the statistics and maps tab if desired. -SHOW_PROPAGATION = False +SHOW_PROPAGATION = True # Where to look for the above mentioned propagation images. PROPAGATION_BASE = '/var/www/mirrormanager-statistics/data/propagation' From cf19e9fd3e246accb7a3df0cd4e590ea233184c6 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 17 Dec 2015 17:16:18 +0000 Subject: [PATCH 14/32] Forgot to prefix the version with 'f' --- roles/mirrormanager/backend/templates/handle_propagation.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mirrormanager/backend/templates/handle_propagation.sh b/roles/mirrormanager/backend/templates/handle_propagation.sh index 877f109338..d0c72967d1 100644 --- a/roles/mirrormanager/backend/templates/handle_propagation.sh +++ b/roles/mirrormanager/backend/templates/handle_propagation.sh @@ -22,7 +22,7 @@ if [ $? -ne 0 ]; then fi for version in `jq -r ".collections[$i].version" < ${ACTIVE}`; do - ${PROPAGATION} --outdir ${OUTPUT} --logfiles "${LOGBASE}/f${version}*" --prefix ${version}_updates + ${PROPAGATION} --outdir ${OUTPUT} --logfiles "${LOGBASE}/f${version}*" --prefix f${version}_updates done ${PROPAGATION} --outdir ${OUTPUT} --logfiles "${LOGBASE}/development*" From e64e3e34af934bd2303c939a5772124548bba2df Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Thu, 17 Dec 2015 17:18:04 +0000 Subject: [PATCH 15/32] Add fedora-updates-testing.repo to minions --- .../taskotron-client/templates/settings.py.testcloud.j2 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2 b/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2 index ab54bbd90d..74d30b4ac5 100644 --- a/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2 +++ b/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2 @@ -44,6 +44,11 @@ write_files: owner: root:root path: /etc/yum.repos.d/fedora-updates.repo permissions: '0644' + - encoding: b64 + content: 'W3VwZGF0ZXMtdGVzdGluZ10KbmFtZT1GZWRvcmEgJHJlbGVhc2V2ZXIgLSAkYmFzZWFyY2ggLSBUZXN0IFVwZGF0ZXMKZmFpbG92ZXJtZXRob2Q9cHJpb3JpdHkKYmFzZXVybD1odHRwOi8vaW5mcmFzdHJ1Y3R1cmUuZmVkb3JhcHJvamVjdC5vcmcvcHViL2ZlZG9yYS9saW51eC91cGRhdGVzL3Rlc3RpbmcvJHJlbGVhc2V2ZXIvJGJhc2VhcmNoLwojbWV0YWxpbms9aHR0cHM6Ly9taXJyb3JzLmZlZG9yYXByb2plY3Qub3JnL21ldGFsaW5rP3JlcG89dXBkYXRlcy10ZXN0aW5nLWYkcmVsZWFzZXZlciZhcmNoPSRiYXNlYXJjaAplbmFibGVkPTAKZ3BnY2hlY2s9MQpncGdrZXk9ZmlsZTovLy9ldGMvcGtpL3JwbS1ncGcvUlBNLUdQRy1LRVktZmVkb3JhLSRyZWxlYXNldmVyLSRiYXNlYXJjaAoKW3VwZGF0ZXMtdGVzdGluZy1kZWJ1Z2luZm9dCm5hbWU9RmVkb3JhICRyZWxlYXNldmVyIC0gJGJhc2VhcmNoIC0gVGVzdCBVcGRhdGVzIERlYnVnCmZhaWxvdmVybWV0aG9kPXByaW9yaXR5CmJhc2V1cmw9aHR0cDovL2luZnJhc3RydWN0dXJlLmZlZG9yYXByb2plY3Qub3JnL3B1Yi9mZWRvcmEvbGludXgvdXBkYXRlcy90ZXN0aW5nLyRyZWxlYXNldmVyLyRiYXNlYXJjaC9kZWJ1Zy8KI21ldGFsaW5rPWh0dHBzOi8vbWlycm9ycy5mZWRvcmFwcm9qZWN0Lm9yZy9tZXRhbGluaz9yZXBvPXVwZGF0ZXMtdGVzdGluZy1kZWJ1Zy1mJHJlbGVhc2V2ZXImYXJjaD0kYmFzZWFyY2gKZW5hYmxlZD0wCmdwZ2NoZWNrPTEKZ3Bna2V5PWZpbGU6Ly8vZXRjL3BraS9ycG0tZ3BnL1JQTS1HUEctS0VZLWZlZG9yYS0kcmVsZWFzZXZlci0kYmFzZWFyY2gKClt1cGRhdGVzLXRlc3Rpbmctc291cmNlXQpuYW1lPUZlZG9yYSAkcmVsZWFzZXZlciAtIFRlc3QgVXBkYXRlcyBTb3VyY2UKZmFpbG92ZXJtZXRob2Q9cHJpb3JpdHkKYmFzZXVybD1odHRwOi8vaW5mcmFzdHJ1Y3R1cmUuZmVkb3JhcHJvamVjdC5vcmcvcHViL2ZlZG9yYS9saW51eC91cGRhdGVzL3Rlc3RpbmcvJHJlbGVhc2V2ZXIvU1JQTVMvCiNtZXRhbGluaz1odHRwczovL21pcnJvcnMuZmVkb3JhcHJvamVjdC5vcmcvbWV0YWxpbms/cmVwbz11cGRhdGVzLXRlc3Rpbmctc291cmNlLWYkcmVsZWFzZXZlciZhcmNoPSRiYXNlYXJjaAplbmFibGVkPTAKZ3BnY2hlY2s9MQpncGdrZXk9ZmlsZTovLy9ldGMvcGtpL3JwbS1ncGcvUlBNLUdQRy1LRVktZmVkb3JhLSRyZWxlYXNldmVyLSRiYXNlYXJjaAo=' + owner: root:root + path: /etc/yum.repos.d/fedora-updates-testing.repo + permissions: '0644' """ #ATOMIC_USER_DATA = """#cloud-config #password: %s From 6750a233fd76114ec04bfe21cc64359c7668741f Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Thu, 17 Dec 2015 18:20:57 +0100 Subject: [PATCH 16/32] Turn off namespacing in gitolite for the moment --- roles/distgit/templates/genacls.pkgdb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/roles/distgit/templates/genacls.pkgdb b/roles/distgit/templates/genacls.pkgdb index b1d975a4a3..471a33a622 100644 --- a/roles/distgit/templates/genacls.pkgdb +++ b/roles/distgit/templates/genacls.pkgdb @@ -131,14 +131,15 @@ if __name__ == '__main__': (pkg, ACTIVE[branch]) ) - print '' - print 'repo %s%s' % (key, pkg) - print '\n'.join(buffer) - for reserved in RESERVED: - print ' - %s = @all' % reserved - print ' RWC refs/tags/ = %s' % ' '.join(writers) - if masters: - print ' RWC = %s' % ' '.join(masters) +## While we debug this issue in stg +# print '' +# print 'repo %s%s' % (key, pkg) +# print '\n'.join(buffer) +# for reserved in RESERVED: +# print ' - %s = @all' % reserved +# print ' RWC refs/tags/ = %s' % ' '.join(writers) +# if masters: +# print ' RWC = %s' % ' '.join(masters) # Bring backward compatibility while we keep the symlinks in place # from the old to the new locations. From 0e2ee11f588d2d067455d37d065ba58c91f03dc3 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 17 Dec 2015 17:32:13 +0000 Subject: [PATCH 17/32] Conditionalize that so I can debug in stg. --- roles/distgit/templates/genacls.pkgdb | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/roles/distgit/templates/genacls.pkgdb b/roles/distgit/templates/genacls.pkgdb index 471a33a622..b6917db328 100644 --- a/roles/distgit/templates/genacls.pkgdb +++ b/roles/distgit/templates/genacls.pkgdb @@ -131,15 +131,17 @@ if __name__ == '__main__': (pkg, ACTIVE[branch]) ) -## While we debug this issue in stg -# print '' -# print 'repo %s%s' % (key, pkg) -# print '\n'.join(buffer) -# for reserved in RESERVED: -# print ' - %s = @all' % reserved -# print ' RWC refs/tags/ = %s' % ' '.join(writers) -# if masters: -# print ' RWC = %s' % ' '.join(masters) +{% if env == 'staging' %} +# While we debug this issue in stg + print '' + print 'repo %s%s' % (key, pkg) + print '\n'.join(buffer) + for reserved in RESERVED: + print ' - %s = @all' % reserved + print ' RWC refs/tags/ = %s' % ' '.join(writers) + if masters: + print ' RWC = %s' % ' '.join(masters) +{% endif %} # Bring backward compatibility while we keep the symlinks in place # from the old to the new locations. From adc5e177b646af4a22aabb19e0cb9a84fd9c3061 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 17 Dec 2015 18:01:40 +0000 Subject: [PATCH 18/32] New mac addresses from the new energycard in arm04. --- .../dhcpd.conf.noc01.phx2.fedoraproject.org | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org index bc400897b1..a839bd2ed8 100644 --- a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org +++ b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org @@ -814,25 +814,25 @@ subnet 10.5.79.0 netmask 255.255.255.0 { } host arm04-builder00-mgmt { - hardware ethernet fc:2f:40:c9:73:0e; + hardware ethernet fc:2f:40:7b:48:c6; fixed-address 10.5.79.100; option host-name "arm04-builder00-mgmt"; next-server 10.5.126.41; } host arm04-builder01-mgmt { - hardware ethernet fc:2f:40:a4:38:12; + hardware ethernet fc:2f:40:fc:11:6a; fixed-address 10.5.79.101; option host-name "arm04-builder01-mgmt"; next-server 10.5.126.41; } host arm04-builder02-mgmt { - hardware ethernet fc:2f:40:14:79:56; + hardware ethernet fc:2f:40:5a:e9:b2; fixed-address 10.5.79.102; option host-name "arm04-builder02-mgmt"; next-server 10.5.126.41; } host arm04-builder03-mgmt { - hardware ethernet fc:2f:40:62:8b:56; + hardware ethernet fc:2f:40:a6:b5:42; fixed-address 10.5.79.103; option host-name "arm04-builder03-mgmt"; next-server 10.5.126.41; @@ -1259,25 +1259,25 @@ subnet 10.5.78.0 netmask 255.255.255.0 { } host arm04-builder00 { - hardware ethernet fc:2f:40:c9:73:0c; + hardware ethernet fc:2f:40:7b:48:c4; fixed-address 10.5.78.100; option host-name "arm04-builder00"; next-server 10.5.126.41; } host arm04-builder01 { - hardware ethernet fc:2f:40:a4:38:10; + hardware ethernet fc:2f:40:fc:11:68; fixed-address 10.5.78.101; option host-name "arm04-builder01"; next-server 10.5.126.41; } host arm04-builder02 { - hardware ethernet fc:2f:40:14:79:54; + hardware ethernet fc:2f:40:5a:e9:b0; fixed-address 10.5.78.102; option host-name "arm04-builder02"; next-server 10.5.126.41; } host arm04-builder03 { - hardware ethernet fc:2f:40:62:8b:54; + hardware ethernet fc:2f:40:a6:b5:40; fixed-address 10.5.78.103; option host-name "arm04-builder03"; next-server 10.5.126.41; From 59c954e8ffeb4dc4fce77d278849c645d199022a Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 17 Dec 2015 18:11:51 +0000 Subject: [PATCH 19/32] First step to disable FTP in MirrorManager As discussed in https://github.com/fedora-infra/mirrormanager2/issues/99 This is the first step to remove FTP from MirrorManager. With this change it is no longer possible to enter FTP URLs into MM. Signed-off-by: Adrian Reber --- roles/mirrormanager/frontend2/templates/mirrormanager2.cfg | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/roles/mirrormanager/frontend2/templates/mirrormanager2.cfg b/roles/mirrormanager/frontend2/templates/mirrormanager2.cfg index bcc3288af2..512224ab7f 100644 --- a/roles/mirrormanager/frontend2/templates/mirrormanager2.cfg +++ b/roles/mirrormanager/frontend2/templates/mirrormanager2.cfg @@ -121,6 +121,13 @@ MM_COOKIE_NAME = 'MirrorManager' # decide where to store log files. MM_LOG_DIR = '/var/log/mirrormanager' +# This is used to exclude certain protocols to be entered +# for host category URLs at all. +# The following is the default for Fedora to exclude FTP based +# mirrors to be added. Removing this confguration option +# or setting it to '' removes any protocol restrictions. +MM_PROTOCOL_REGEX = '^(?!ftp)(.*)$' + # If not specified the application will rely on the root_url when sending # emails, otherwise it will use this URL # Default: ``None``. From ed6dc3bd28e995a02a73c0acf1b1a508365b0742 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 17 Dec 2015 19:31:01 +0000 Subject: [PATCH 20/32] Need geoip on the MM backend for maps creation --- playbooks/groups/mirrormanager.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml index cd55e96e3b..9806cc6f22 100644 --- a/playbooks/groups/mirrormanager.yml +++ b/playbooks/groups/mirrormanager.yml @@ -42,6 +42,7 @@ roles: - mirrormanager/backend - s3-mirror + - geoip handlers: - include: "{{ handlers }}/restart_services.yml" From 5ab91a17b6f1ad606638c76343a1889b20cb0a4e Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 17 Dec 2015 20:06:14 +0000 Subject: [PATCH 21/32] Update various ssh host keys --- roles/batcave/files/ssh_known_hosts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/batcave/files/ssh_known_hosts b/roles/batcave/files/ssh_known_hosts index cd44f773de..58adcc5d28 100644 --- a/roles/batcave/files/ssh_known_hosts +++ b/roles/batcave/files/ssh_known_hosts @@ -1,4 +1,3 @@ -aarch64-01a.arm.fedoraproject.org,aarch64-01a,10.5.78.70 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSqSQG6fk6000kVoqp9BRwWIDYjUY72IpsFf5as/6p7R6DypshBKlXYHEUdRhy/S9E6kBcsoFk4tfcN1GYnnv5BxmWjfuGm+W4RUgv4cHISNPnabzCHnS88DZVeCIbmHwaKWx4tnhCTdZq5JchCx3qGokkfo2NuOETs7fKme/H6q4CSL6Reg6PcWKLvHYxgAGX9YZ4otdFqTVyLHMBBeavcYIPUWcp/MA9T/H8ufETxNZkDP8IzVHTPbv9DvG1lifrCRc+Ik/VOOkdoTgILI1Hdr4GyRQR816xowyftkMmLkB7FvUimlh7x7uZNPRu83iQl8weJ4kct0HnNmanEpUh aarch64-01a.arm.fedoraproject.org aarch64-02a.arm.fedoraproject.org,aarch64-02a,10.5.78.75 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDPskYBrt2lKSbyTz4MrX4JqQ4RYfAGG/ji7DuPDu2yellGbvU2Efp818/mAIcmVYGCXSV/PQ3Cbk/B7xQ+4Qgeku/CNvmBn8ULIVChnrGCgDJXwu2xCR6lRVDYzU7G2eLe9RlB0a+3mSBar6NEIngLlK9V2ntAjiprHO+ue9cUu3OWQSn+0933KwVAV1Wo/VYXkQrIZkWN1LIEMMloDncgucVX5s+2ub50pgc+QuK02ECypVjlFPH5RRcOYjRbINiF7g7pQmLr+p6kruvhFx5OO4MCU1yHkT9KqJ8NLelXGymNHtJ9qFQVqL+YFW1ee7GGiwvP8qIhKq0SGCSb0XbB aarch64-02a.arm.fedoraproject.org aarch64-04a.arm.fedoraproject.org,aarch64-04a,10.5.78.85 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDNRCxYDsXGreARJ9grxM69eAq3VmaF3DVYjz6p7Ij+lRFY3SexgQQw83EV6bAZE4yfdejiHCaV7BeX+unSGbP084oYaAceotRdLAbqhkx+4u4/fAHV62IzT8ArgglMi1GxC33Tuvw96PoizB2ZwYTRs4ZCxjv8vvwFiiITtmMU5EwCZnKMEDxmH3lYoJFcuNFZovrrrfqS7Za9Q0nJhh1Bm8zleDfcY1ibk+ip+3lrtHM0ZgMvNvFOrCJ2jrlHt+WTzzQPex4MfyNoc4WYQz8vNCSKbh0HWh0ysZUTypIZ2Zi+tr5qLoyBTlTVYhZi/13BEVe3cPSFlAjXuyg+qGS9 aarch64-04a.arm.fedoraproject.org aarch64-05a.arm.fedoraproject.org,aarch64-05a,10.5.78.150 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUdxodcGnvn0iS70Yqd1LvGx7Zz1Mp50evRPu5W64bepTechFZzhqpg8qHEh18RUryA1e/5N0JImHpr24HELbU5Z9l0g2mqt2a3WNU0MCpBh9q3qcVrQ3sUYlAahvQz9SXEoEX9v3hN2ewUjt0a8QDYViZcHMDFED0Xhe7oZ4/3g583cw7N9lYGry2zmch7trejpU9M4A2iavIE1+qBtRAudee9UpDHB3pJvHn+y5hTb/iFt7gx6lBZO8/9yyWsb9u/+VtdQoUyheLpa1Z411UvHuAP7wlsdE2+dcqzfE6OjrKDTcUQSekAsYVPbBgEMbpl+YlhUtHUyu4l/QYMlLJ aarch64-05a.arm.fedoraproject.org @@ -202,6 +201,7 @@ cloud-noc01.cloud.fedoraproject.org,cloud-noc01,209.132.184.17 ssh-rsa AAAAB3Nza collab03.fedoraproject.org,collab03,140.211.169.198,192.168.1.70 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAryrVdSXlFRhs+TSnE2BlEn8a3SlMJ7ik3v/B17Pz7rDPy/RspTUjJgIss/UTgMB5EuRiEbrc4xT5PsGAnwH6g4ypEnuL9aeadenlWHkbzv5YyELq4z8xNKwJ8O4C0HCcrnq2JA5cRQx89KEUuG3DEPvADoLszI/Vb5YOk1qhcJG3oR+tFqXE7M3mAofa09dp1orkdgDYkweWaHTi3gQJevjYgAzZVvmJx/YmgsukuCa+29l+bC3hpzco64ymHvY7bjAQws1gEqh5+9EMDzUYZnPTR0278eC+L4VVQOJaj2kT5UuoqciRaferMFEEcM9TJfupFDbqqnjymQOhTpeUxw== collab03.fedoraproject.org coloamer01.fedoraproject.org,coloamer01,67.203.2.66,2607:f188:0:4:21e:c9ff:fe42:836d,192.168.1.89 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzMY93iyU+7wDTeYj3Uek+2q0MsBXg4fWxy8Q3roGEn0Hn7GJC1vuH3F1zUbvAAKavKwr9z/e4PrEhdYjfA5/2hZb81f0iuVMqM816fY3CfreopY3fGvWT/ctTS/45cSNrjIKP8f/B6R9cudObDCOsFHTfNwLWPDIwXD0r30veFWv4zBX6CW1ItQIos2S1OykX7T1dEAf1bpB/IkpprkZzqbqnftWB//9xi/dWYM/Phs4QtFZoTTiRU/Y4vg/mXI1jbYTBt9koMCXUPnttGf8rM3bKpcil2HMW8Oz2j00jsMhLQ6IvLvZ+zd1yt5agV7ukeYz0DfILvqjaAnHerccj coloamer01.fedoraproject.org communityblog.fedorainfracloud.org,instance-207.cloud.fedoraproject.org,communityblog,172.25.32.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOPvCvfz50iy2T9tgwPDWVBTOXg39Kcf2PTzqV4fGJ1F1cgqqvzM6Peg9ckakP7lCHoYCGwY5hqZW4MVyyJq+VoNsqJ+52u4t+nW1GVZO6tDChI+mvAr21xkz/crhdEe0bRQJ4X3bo2mKo14USE76v0xqGJmymR/emrKbn1QzXi8gTUmh/TYUm62CZCvYFL4BAeWvRgtx9ZQUAn2H1hfj8BH7m6dwH1KMFvXjp1cDkZqJ/dLo9M5t0EDZehbqSIwFpLAk5PTEND/YFNHH66mExs+anaXTuxvlv4wz0hjU94oZ6AtVnT1l7pTgIWYTSPM7UILwg79kFutG6dfcDknzj communityblog.fedorainfracloud.org +compose-aarch64-01.arm.fedoraproject.org,compose-aarch64-01,10.5.78.70 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEdqWXO88MZ2kvayGbFwo46/QZSxv1cKUpmQHSGDqMdQY7j5jzepfMiTt36nRQwIMgqkXbTQ9lUAfm977cc4sXcTnK+6PmZDrVU72PMrp0/dfF0Wz7+jR4Ot3WJMZImeciE9nV/JpAzSJvqRu+yMAa9rO1DlVkA05guqW3FqC7RnHsQ23MZioM7kwVtsiuC1l3undgSiqenLCLdLg6oMjEDmFuOu8xLHo7kH2xubyeiGD1P3SRNvV2VtVoaF+rasPNcuA4hxvHiGrRbm213IjwGrgU3yRCgP2LK0ZTMDLWzK6SDItT2y8Y0iG4grAkWLrfPbkEh8iOA/GQa3vlooTp compose-aarch64-01.arm.fedoraproject.org compose-x86-01.phx2.fedoraproject.org,compose-x86-01,10.5.125.41 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDmg1ib9OddYRDehPCcEZ2GrpTy9ILlOfGxcVOPN+Yz62Wd/ozdz43CFCNWOduGGmQou3e8mFT7ImqXK8TrI6m9vvfv6icYUqyQY2HecKR/coBhWTCoPpC+54LMyDDYjSMitQjMJL/04CZDyICzQJgzjQd2qWEeTRzgEpUg0X2/AC4lomc3AV6G572AjaffavRrk0Cc63EjOiwxMIbNqrK5Rv5NsAcVALODJ4BYI78/58uUupXbNMKY4/bfCSAUtFO9nw/lfWMGCEw4EgEi1vKe+PBpP/c9vhp4AAhHk/W+eU9o+5bEYgIUdhn8Ez0VAZdtQWmUHPFjtI86r3GBfBhd compose-x86-01.phx2.fedoraproject.org composer.stg.phx2.fedoraproject.org,composer.stg,10.5.126.6 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDoK0SjIFVzZ2rzoMDF2kKKBzEtmzQqag23f/TVgpEqeSkfujy4Kp8B1wxR4HntVJ2j9y+se46kJrNbS/b5owet2FDxH1sUF3z1Mgr9wpQKPGBq3iKP0FhqJeLjH4VWOmzUQ5HJpTHr5thXF+q/7TZYd5ZSQBS3MPJG4NpTjuJ31Lo0UhW7FkjXav92qItx9beTaHohpu9BPzbnSHwnWp0x3ppFRuGBYsZ+XEzBZeaey7ejwYdSGYSB31PLPFjEpD8I2lPptMnVqUhu6g+oVE/0zIzs2tDdwap3pO3PKXotWVXhrDPhNcYMhSXehAfc7ZvGjBckGSixtuakR5l3BscL composer.stg.phx2.fedoraproject.org copr-be-dev.cloud.fedoraproject.org,instance-53.cloud.fedoraproject.org,copr-be-dev,172.25.32.94 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2dM4gaKBM7Y4Ub3M9hkiKnC52lPYFBDtvqxU1G5PaAyCP0SmgYGuzNuFYiCXNx3si1EsqT7OJCpo3ldJkhZQ6Iiqj3xMoCVXgiYsZoVF1nrjGUaK8UDTR6gVdvkMs9ZNhAUUOnRcM5wElffxkXkKW18V+LIFIOr9xVvxZmVbP/4in63YktP9mAQIZswHeuaNuyhR5qQ1angmHA21nnp3EP1QEe8EWTt1jbQdiJcwfAKqQTk5wNuFUchQhsSDIU12QAxpsG10xM0Z0nAn4bBifL4/nh7oGY00BI8xiuzj/LM2AJz3GjHqxY58L/qrVWG2VC4fC5IZMeVeZCLi3OCUN copr-be-dev.cloud.fedoraproject.org @@ -406,7 +406,7 @@ qa13.qa.fedoraproject.org,qa13,10.5.131.21 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABA qa14.qa.fedoraproject.org,qa14,10.5.131.22 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6z6ubDVAP8aJThBizEOYbsCcRX5PD2sM6xRuywQNzDTS4vPpWOTlnfmi7Tw1HJQ4+udnXZ5EjTSNrMQbq1tAX5j2+MdSwRS/02KY6WAUV2GPC6etAtXgsv2EJjnLb5V7fbdPLafXUUdPWlGovJZJ12VQMjvBrT/43qVXH8VNZm7YrSfCdto5kWO9hpywl83VYZVjSfcAMGBVB/uTCfdN8YEBdvlsCg0mupDybY0iJt4u4SsHrMdnr8w4kxWM6Ee9IwZw6g6BynlMExuk2tR9E7EUUr14MvLsBisTf01r11i67mlVtKLwpUoteQU3jFTQi7O1ak7J8zabD0oRjHiyJ qa14.qa.fedoraproject.org qadevel.qa.fedoraproject.org,qadevel,10.5.124.180 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDhfrbq7UoZwPxloQAWhMiXuCtz5x4LWYvzawQhyLtUodWLCwh5XHbMbZU89fImyZj1l4/Sw/fIIQBd5qvmQ9nRw0x42MVXsH24R1QcwRrlnR8TllGNOsQ+FMQfVs6Dvv7YDtEfW1TfS3HsRtgO/GbxDP676AQ4+rdVzurwilUFvN+uDei9r7keoNhvPpixxjj2OHAszMfOv8leZrZIw8YD0tVlFv/DUvzPX2EidEGAyWS1JO09wtO5klNOJy4iDMwY5XjfilG8MPp2aB9B8C1DjqGTAfLyUZOs3vc5fw04rXGn5ZcdDhvJ/7p6KXgRHPTnUa9tqMIvSETTEQ/VsQrN qadevel.qa.fedoraproject.org rawhide-composer.phx2.fedoraproject.org,rawhide-composer,10.5.125.69 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC78E/GWWiG4IaxEkQn+j2JQNfCzolHJcy0sRq18KjUKmrnAmOSEPnY5yxhwMktxu2hYYBHO6nc2j9c+fZSymw2OX3MVOdGG4j08mbmCkobrQY6ZZBMhEmJ+1n6mHo8jHJNB9QHF7t0e3I/9NQF+S+CTUSNBEjqkraH/kX71RC4aGrdxEHX2e9YKHIJFtViUAbib/zQ5YUKt9lzbqJ0jh1msFyW8N+R2li3ssKVlUbVkstpOqoQsRH+Wis+Ebaqcl0Z/6gdKbwAfSBc7e5MvG6d1BmZjT/5TZwj+rI3TL7gq+sjPCcNeW41RToxNGhJupQr9JZImK2qfSArTy0i+O0L rawhide-composer.phx2.fedoraproject.org -resultsdb-dev01.qa.fedoraproject.org,resultsdb-dev01,10.5.124.205 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7wjnQ8YSi44wj5oI5WN78T2Q77rwqK5myOODBJkKnS0ke66Llcln8Vz5YfVBg9zAnfHHiYNjICJRcqUvN7kyXnju6YgYWrZEO9PGr6pi4bIk3mAEpBK1dyzaTW+bxvjTezvKuCW7IfVDQb62u4U49+tyUB4TyZHS11EnZAPBLH9uvRbjgPDRtqFYZuNplmykzwrU4qaKrQz15SbR0RXMU9hqkSzt3mA30PkZoHnm/xSgsEoics17lWXZWBcEcSmFS++4qFsIF953L5jAcDOrFUU+gY8hGgvRyD9JIFf4X5qD61BSsXydIRIf3Fs2qj+gtWAl9z9R221Wi57yxAdIB resultsdb-dev01.qa.fedoraproject.org +resultsdb-dev01.qa.fedoraproject.org,resultsdb-dev01,10.5.124.205 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCx0ltQM6n0mmadgQQgLti1HE43VaVL9g+kARSBO0f6B3ljuPqxAMURC/9UijuFKj98qLfsWpXpPcCCI6DVx9wUnTj+1Vo5zBwpPjCEkUiSE1qaCYYikYYM9dkqL87AoVv198WYoHWRCDOoufpAbyysCFcfjoccwQYFG2JZ7EGxURcFDkAGPo/JJHsKA+6M/aGuMSBFTPzAqRuqJpmnzNmwJwCidscNd7iQpa37jMfK8+JtxN5Kzuvqlwol3npzFqH7Xb5YUJcVskFW4Jkk8B+drRNHNsjp/okZq5GpM2zsMPvfUHG7XJ2nLWCqQPPG3Opu8RRl4oLwxSnWO1x6kGaH resultsdb-dev01.qa.fedoraproject.org resultsdb-stg01.qa.fedoraproject.org,resultsdb-stg01,10.5.124.147 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8tVlkWDNCLqhGI38/Kcft5panado6Ty7ql08Xgq3AjXH6io9HkNH7+OJSexK/nZlioVmwai8z8+uBH2Ynvs3IqWI6E6XEIX2utxYSmg1Sl7HExQQwljZdDb+g9Jc6KAGOGm2jGQs1yITPNSEQEyIv7z7HZesdjU7yK0x5zt7Hf3NtjH5Y7k8sRhgDEIutDzgftTSHpSBO+MNehUo1xmJt3rB371zoHhoUgRjc+a9yTG8VERP70g2yjvzctZQw32ujBusrDnx5xu+Xox/Kr0BpdL9XcZopsfojcci5g9mxBNy8ewgZcXaQGVqA1dpBawF2alPfr4uiLxG5ZWrWoFF3 resultsdb-stg01.qa.fedoraproject.org resultsdb01.qa.fedoraproject.org,resultsdb01,10.5.124.207,192.168.1.137 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFcIhZTRKQHD+/PAC1XYV7RqAqFcqbnQJQsQLL5PZtKg3yOH2DJV9IrKcRgeFQzH3OxBp4IW3Psm/uiUl8zEFfAdXqINJ31v0/MJOz74rz1edQ+JTCcdY7pdnFmVFLAy6aP4v7iExlWXnZwdspe7ILcyjM5PLLDPY0s6MorbFqE7zTT+SeWvfnexs0+Bv/hObQl5eEfUtMF03dCISiCHM6ycnU7LuuBQLmbpBy3NtMBLJGV1W90Eoll+hbJo8fAWRNkCFZUlyLMfojwR1Qm2yMR2mEXDJqzqi3i4IQump1O99Bs+wSV3WhLPSXyufU8WQqnchzMIRp8Ppp4pf6EYIP resultsdb01.qa.fedoraproject.org retrace01.qa.fedoraproject.org,retrace01,10.5.124.171 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCp3fTQoBznUYTj0t/VM0q9LWxsKZlJlS2Omlab0Fqtr1DvjqZ9k1Erml8ra56J6w/K1FOePy27DKLDJFVU06bYEr+Ol9e34BMvwI199y3zErteZCItZAwKBh37pu/iSdbGZ1mrjsCJPYsQJLrC6EaaKJcDjhw6tOQexbTPlWy8KUthRZRvRXZVJFJaFGd8sVDxX32xm+FyyjzNuQJm1AD/C8CWMRJ2iSi8cxDHq8tiWJEYB8pvZ62L2w4refr2u5lxLx7xPmQ9qW7AWuqEeV46lmFjlOY0wMObVFGi7vLU73Eu3rcebHEF1NnMo+nR2BzR9XoNITa9DYjs8SIfiHwJ retrace01.qa.fedoraproject.org @@ -434,8 +434,8 @@ sundries02.phx2.fedoraproject.org,sundries02,10.5.126.40,192.168.1.128 ssh-rsa A tagger01.phx2.fedoraproject.org,tagger01,10.5.126.212,192.168.1.120 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDS+xQbmPO0GjwQJzrptHNrzDELjVL1Tpeuwrg6377VD9bUanTFhSk9g6DlqH3UpjA0T0O5kxIGdve1wq9Z9VjTi13pFT8Z1+UHQPBOWETZrzh5IsuieoAQIYxz3opcnOwmac+jqdZUbBZa5cAWE65C9AYc35q+g0h9Fx90wTH/uuTZojjGOR96b5cx24uN9BzagI9RToyE5axgR2el+huQ/FtAtjLZzOIVRKW0ANJHnP7dwsRr+KNRknzb4fwiLwSI4v6C+PgyQ6RF+66v/ZpBByEtyZ+9jWCRG8Yd4hamLa8zoqCdnD/ZojB8gXiXMJOU6F90zFS/eAT92k3AwLMP tagger01.phx2.fedoraproject.org tagger01.stg.phx2.fedoraproject.org,tagger01.stg,10.5.126.220 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtD4Y24Z1LvzW1Ic1wAkBuRAdRxqhdwXI6xJe0/MF06Wq1ndpaqtyJ2DKQIxAPV2Fh4X8EdN1M73bdPzT0u3EuHPjdTTy6Uy2WSXg8NY5y7TgcXDXiOscDYuV3+KE7MROyjXz4oTv8Mi6dqG5NkJE0osoJezC7LKckCy4AEjAykXLKN0Lk6jzKgon8PRi/VZKJgKdEgXQ3kLsoCi/xYryLWDfAfRdzPRUIENstgPQc4OzoLo7YpUc1jpsqhKg8N23yI0BsQzMXjM6cUFVMHduSI1PyhBqEnBUIVNqXopOCfq1Q7yKTgUzkJ51VDM4sXGpurgMi2g3BiZg+ujhVzOsp tagger01.stg.phx2.fedoraproject.org tagger02.phx2.fedoraproject.org,tagger02,10.5.126.214,192.168.1.121 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3pp87EH1gS4ZxCHPFGEbVDB8b4c9p4LWfSMa54nySMRtPX/bXxoTDSnFFhdRzF4dG+wH4+unQAaMlfvF9n8TDY/Lk45/szqsyC8ZZVpz+jY8eAOYfNWbFlPZvSqqFQA1owUpFd1+uCCUgX1DOaliVuddFJTCHK9zGKsZH8IJVuIhDn/dWZchHGJepB9CGP1XqTL71hUkVMjYyd5+DOmbPQMQ56axkpxwPFA2jCMpt5UDS0/4Gt70+zElGXQ9V5wj7suxJ0uzWG75juGqLtPS2sZwpvXKRVY6bhX47nJS77sbbBY5QEPcJW2C7ZQT583aKnX6AyOr34RQkLRQraqcp tagger02.phx2.fedoraproject.org -taiga.fedorainfracloud.org,taiga,172.25.32.79 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6wViOMz06vL/Ef9jUvRmAFTQ8CNsPPfOnWq5SNy27SjI5iy9mqhJf4H/tMbydQCMS01Nbqy8/9w/Z47Qim7WHq/Y+ud/CcRmTOx0uIhU9paDjAEHH14IuP7q6B2GIH37nmykmIxSHBZLzOslWSc2wvLan5U0yhcySaQWpjOiCvZrteLBiKIRBEWRNYNEA1N9FnApWFnbCA7L1Ha4mb9QWHjUrcEkjES2gMCDE22+CnXGrKdFfF7RJB5wXLAn3myrxwZqtKI0hcj/Z/fnsqLQEpsAGnh9GGJWMyFrbMhRvV7KXzTWZ7KzqT3uiIQ8/x0YmIM6tDNx0XaCvPQOUYCE1 taiga.fedorainfracloud.org -taigastg.fedorainfracloud.org,taigastg.novalocal,taigastg,172.25.32.80 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDRNVP2Fwrlo4x2fUC/rhXeddr0qW747bPy70f8shIzWyBhqH/IZb7j4xk4vJh/fbPV+1dmLBJ7JaKLR7OzVL78rlcHD7bzbs1IzR9H4eCEYOmBCzBtkbkFXVGS7JseR2PJ2fHbIjd4JfKovFGTROQGYHsQR+8U85FRYSd8OUHJ4+ifkgAsXXs0YkLKCz8q5jTcl2+Vt+KnlYIXIGgBz9y4aAjQlJIlINIJwUAo1oxpNZvaDgQkgkd5HCvFQg2lay6Dw3mqwCUzG3PtTU3fulLt7KDSvKkYDIsZaqWq8twQ2fHvvbJI7mHwq3Fjgvzkegbd04kPCq0z6bU6HtmgQVpH taigastg.fedorainfracloud.org +taiga.fedorainfracloud.org,taiga.novalocal,taiga,172.25.32.79 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6wViOMz06vL/Ef9jUvRmAFTQ8CNsPPfOnWq5SNy27SjI5iy9mqhJf4H/tMbydQCMS01Nbqy8/9w/Z47Qim7WHq/Y+ud/CcRmTOx0uIhU9paDjAEHH14IuP7q6B2GIH37nmykmIxSHBZLzOslWSc2wvLan5U0yhcySaQWpjOiCvZrteLBiKIRBEWRNYNEA1N9FnApWFnbCA7L1Ha4mb9QWHjUrcEkjES2gMCDE22+CnXGrKdFfF7RJB5wXLAn3myrxwZqtKI0hcj/Z/fnsqLQEpsAGnh9GGJWMyFrbMhRvV7KXzTWZ7KzqT3uiIQ8/x0YmIM6tDNx0XaCvPQOUYCE1 taiga.fedorainfracloud.org +taigastg.fedorainfracloud.org,taigastg.cloud.fedoraproject.org,taigastg,172.25.32.80 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDRNVP2Fwrlo4x2fUC/rhXeddr0qW747bPy70f8shIzWyBhqH/IZb7j4xk4vJh/fbPV+1dmLBJ7JaKLR7OzVL78rlcHD7bzbs1IzR9H4eCEYOmBCzBtkbkFXVGS7JseR2PJ2fHbIjd4JfKovFGTROQGYHsQR+8U85FRYSd8OUHJ4+ifkgAsXXs0YkLKCz8q5jTcl2+Vt+KnlYIXIGgBz9y4aAjQlJIlINIJwUAo1oxpNZvaDgQkgkd5HCvFQg2lay6Dw3mqwCUzG3PtTU3fulLt7KDSvKkYDIsZaqWq8twQ2fHvvbJI7mHwq3Fjgvzkegbd04kPCq0z6bU6HtmgQVpH taigastg.fedorainfracloud.org taskotron-client07.qa.fedoraproject.org,taskotron-client07,10.5.124.165 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDbefi7yM9WsZ/KsDc+g5Ix591I1AuE1SaCbuTaJ/bjt8WaRe1mgKDa/6V0VVL6aHNyc98C2ogp267Z5JcnOPoQHq78WzBkVClQiqUWQvi0ntH6FOuuS3w/0edZ5eNHdOlwApvo1Guj9k9eQB8+cFupAAbnjLRPKWKQcXd7a3ABZcxgdXBtHc5dc2i0hE+9Z5ygfoS8foL24gum/4Z8i36mzvYxgWR22EbQ7sdCl/+qx2z/5KoJbcMHLZWqNunNJlAwhAeVT9DVUjIB9SHJ3kubFuXS2YYWSeDGsn50KCowx4ZIj00v2AhM+JO0LPYhlmyBMYN7sfCMZzP60WLdd1G5 taskotron-client07.qa.fedoraproject.org taskotron-client08.qa.fedoraproject.org,taskotron-client.qa.fedoraproject.org,taskotron-client08,10.5.124.166 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLdYw2zEYtaccN4T6QFBIZimmBx8gehs1QwTk8yeh5ChgKPNXDYYB6vvviLRgTBNpWCf1OMTwWNWq4Iruh78PoaE0xwbKy/uYPugvY2YCHLFLiVpU5DHnd/vgyx13AhJ1RGuQ68lf9yt72jMKoWt7ML+0xpUSYbLDP+shG4j1x7ERijJDH+DHc27tTqGpC07mJPBg8pr9HnDLeeKafYIjS4kGQE9RwatuJzOUFVnmDZ3bGMEWdjm9clRpJvfhlHQEBhlCMDVJxAJ7xLRLC91dJePOqES7ObzZ5LoHkb2ZwOoYinFfG6pnqpT2nx6sdYparbovOxUuYuFpq0lOd9i7Z taskotron-client08.qa.fedoraproject.org taskotron-client09.qa.fedoraproject.org,taskotron-client.qa.fedoraproject.org,taskotron-client09,10.5.124.167 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDNxgSmHUGqL/mn21v074meOIt/Z0yRUDqP+qgSVIp59SCJHyuBQX6/fskerHsA1bN84fNHneNtWYfyGEV+Nohg+xhX479tDxRC+VXGHDrlWsWSgZKBo+QOv3W3v3bGxw84w9rGhJNRkUMbJjOhkQWLcNqGE97QOURvqKC1EWlil4ecQS5wYgM+0ZhTIKU9KYdWiaTm1MTHGABJZFMOYYlblQyTnV5lXfuOnTH7AKRGwTiGwgd/LN5DhT03UqXpl1z+AC14FGm6VfERRApsAAk6Dk3yx+EbZgB3uynKCu9QSEny2ACJgjSdiSXv/CkHDg1pbZQjcjBkZfK4dpBkVac5 taskotron-client09.qa.fedoraproject.org @@ -454,7 +454,7 @@ taskotron-client26.qa.fedoraproject.org,taskotron-client26,10.5.124.187 ssh-rsa taskotron-client27.qa.fedoraproject.org,taskotron-client27,10.5.124.188 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHnPcoGs5gs+qUlYrDyF7oNdUx0JBLMroI1WiV+KEZEte6TOp7fiFEXVFV+oaqvxwRvmaiUS8dIOezO3xHkyG3Fb2OxK4HX6T4xtnUSPOcnw4hr58MKzMkJNNwo8Q6hUqgirPIvTMb7ApyVPcGGPWLeKozhA31zCaKK8YZttb84bnUkbBnQ0Nx5bOnor8ulpTpPqZQncg9jwqNqR85ZWR/TgYohPRxIjumccgcYkYHMcVKc45OWKQQg6nVDU3fQsbKJSAl4thTIyP+PlTzb+5TPVpzdlU7ggJgzuMWRxAf50dZwsRHFXGVUZstnxkheme6bPVSNhkFiD/ei1544Ibb taskotron-client27.qa.fedoraproject.org taskotron-client28.qa.fedoraproject.org,taskotron-client28,10.5.124.189 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDzRmhfQRma2LpUrgCiprkw3CFqR+gBWEU3JykrZ3kiF3XSuIZZcn9kBsrPniAa/f/nw+Wcj4RlmgWEyMXmRpuadCxNAh+HLgFgEah1O9+x7BcDqZXDgHCcXhTu1y6VMVcD6GM5G1zXL8+VFS9kGpXgBwYuycmaUIM9FqhqxUQpgKDy/na8ylykyKwvgD17jVHt9MXoPV51gwNDUa/8kBXHx2yXMr6q07ConAkS5ASFN0tt5cduikpdHo5uVCcfJNsBjwuoJeBvgRWhPNq9vcelaE8yp4g9sRF0kKPqrwfX6VYiTb0KOR/CRxOTaIGqWaZns4haXBBMMcbxZ7KpDpoF taskotron-client28.qa.fedoraproject.org taskotron-client29.qa.fedoraproject.org,taskotron-client29,10.5.124.190 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCTjpzZiFlXjWQsAYm53uAd73xTXBdTPYBE1XkwUHUSZN3CAnKnNDiWsKAgUQXlqUyAqoAKRbH2b+O84zf8csGo/tZJIMbh9XkcBFO0ufbaNcBB+lVEarlvjQDUjBgZKR1uILcOp0+NoSMiCXIy9yZzWv5e1UrTJ722y1/5FHocDXWwKeCdnAKlulGlblhj/GPW/zn1eZBLTjtJV2QDXEc+nchc/dWHQ8BBvG2Zt90M2RwBiooHw65Ci1zrGApND7yFtQx5q6SB+HiY49YmTp1ncjRNdAWlp3c8YsSd3oLfkKo0UnUOvuhrO5C01Y2+y2r0jcxpWjTOVu64eo0mZNO1 taskotron-client29.qa.fedoraproject.org -taskotron-dev01.qa.fedoraproject.org,taskotron-dev01,10.5.124.181 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC0DR5IwJZ4Fdwj8xe0h36jRKAL2KtCtIJbjwG+hQrnoRDC+l4WtTm4yiE8/HJPSD+022ciRCgcwweoycc9Q/vXqOnUE1ZNnWFQaYU/7HvVblFxtUjF11y+K3h/yXHGCKseAYeaFvaQVBG7UUn0PE57JiPgh/PXWlkEZQUiyvYESM8FRD+Kg1eZZ6hdAY2j3azbxZbsevYIbKJBpAhhn5mfLllDju/7ODUJLkJoyMRNHBRQg+f14FWX9RLko0SjHOI0ZifOo1a5vt1aU+ZCnSKuOjt0AY+mLOz8f5V3rG4erKvjk+WuU4Aw/39xKSmJRXKU6vbjJh/UPwHpo3CQggKF taskotron-dev01.qa.fedoraproject.org +taskotron-dev01.qa.fedoraproject.org,taskotron-dev01,10.5.124.181 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDYzVmGYh6EHH8UAlgX6FIOJGHsq/63G4ryMC7VgLIwIhp+SloqMtLeQvZ2COzF+ycatlG1reY6+x0lXBlt72jyInnHy3pOKByOQPkMOS6zOLGnK1zWKjsexabgIXUKAM/dEsMJRBvVK4ZnlClZ0ol3+pqjbzT619vEiGZhUIkOXvptKVPkBFAdpiB/ehd2nqESOWa1ZId9ney4LZt7b/5krCY8RTYWQbGWvcndy6L4rRfqkfvW9t9HS6zyQfLouXCwW8QS5nTqY/kmtfse+7D6Ne+IySmaSX/kWB3YlhVOxB2DTP0pE3ZkXMJ4u04i4stySYxkajoonxAc8SUI4Djl taskotron-dev01.qa.fedoraproject.org taskotron-stg01.qa.fedoraproject.org,taskotron-stg01,10.5.124.232 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDeW42gfaJd2W38rgd6AT2yCKkFXk11AGDJAV+2CEV2zDWgvXhwuH9eqcoUHxO/3dAVtrmcMaLQ/69V9wjrOwA8P1efd37R7+g5DPFfXxU13g17g9x+AP9YweBTkbJtEAxqVZ4vP8F+myqf2fASJqQCH2k6FVzWfLgx5+RW/D1ilujwYH42idbmCWIz6hCcoud+PHxApgR5xzacKsLswqkjV+Tswen6iFkrhDqCqU/clKG46sZnLbcMiJ6sLpV4GnSjUA51ho3+91C5HjmYrKd1s7XmYzv9iRvf/ajpA5BNjahJ/Z5xWOmJE9WNLN+j3tPxqSczhfkrXUrORw0AEwJj taskotron-stg01.qa.fedoraproject.org taskotron01.qa.fedoraproject.org,taskotron01,10.5.124.206,192.168.1.136 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLIq4hjXt5WNPe6sNWz5bdQu9Oc7hMhi0aminK5DCNE9Ofz1pAKGalcw51NSOtCy8p0x8Mltdj7p453mEJlQx8Oktu87SgaGFfx3lLWXEpE9Z5EZxts43qYnzOk0qg0KbhhIMsyVl4mHmQcyB8SAtkPbzUv1ncWSpOUk5+beRUqmh34IutvqfOkAUnl1VCi2HbtNA3OMY3HmGNbSYTC+fwUA+jBZoVrmJn+ep41SmBLONz8NesVQKGx13VgvVwbf9D5BkeyRj5WtVNBRLHzawBP6hwagcIKWum8XIU4fkwhwd91kQ41Ccg3okBWxyNYv+9jy2lK13DjrCk/sBkkLJH taskotron01.qa.fedoraproject.org testdays.fedorainfracloud.org,instance-107.cloud.fedoraproject.org,testdays,172.25.32.62 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOPvCvfz50iy2T9tgwPDWVBTOXg39Kcf2PTzqV4fGJ1F1cgqqvzM6Peg9ckakP7lCHoYCGwY5hqZW4MVyyJq+VoNsqJ+52u4t+nW1GVZO6tDChI+mvAr21xkz/crhdEe0bRQJ4X3bo2mKo14USE76v0xqGJmymR/emrKbn1QzXi8gTUmh/TYUm62CZCvYFL4BAeWvRgtx9ZQUAn2H1hfj8BH7m6dwH1KMFvXjp1cDkZqJ/dLo9M5t0EDZehbqSIwFpLAk5PTEND/YFNHH66mExs+anaXTuxvlv4wz0hjU94oZ6AtVnT1l7pTgIWYTSPM7UILwg79kFutG6dfcDknzj testdays.fedorainfracloud.org From 6bdfffe6363fa3ec6dc5c9279641c8e6e4144e76 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 17 Dec 2015 20:27:16 +0000 Subject: [PATCH 22/32] Files for interactive mirror map --- roles/mirrormanager/frontend2/files/f-dot.png | Bin 0 -> 1429 bytes .../frontend2/files/mirrors.html | 70 ++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 roles/mirrormanager/frontend2/files/f-dot.png create mode 100644 roles/mirrormanager/frontend2/files/mirrors.html diff --git a/roles/mirrormanager/frontend2/files/f-dot.png b/roles/mirrormanager/frontend2/files/f-dot.png new file mode 100644 index 0000000000000000000000000000000000000000..e4d576e7c4fb78749a6c7bfa941eb1259fe7ec31 GIT binary patch literal 1429 zcmV;G1#0?QftLu}l}zu6+%+Z*6y)b%U+uG~-cW|I#FX;UvHIG-{%m<#QKX$!2NmCKXT}8VF;7$w^5n3xt>(eE$ z)bmKqfE8MS+UKkA^7c|M0(?}hEymA3)M0`|S$FCNZVpROCr9D*cTjv~z9fJ@3lqQk{CeuEKase3(hLO>G z3v~xC;)_odl+qEb|NcGv(cFezZ+;1f7<3PgL$h>GjKVk{|E5QPLeE0W;3kIQbYG`z z*l3SibP}dZxNeweyLE@w$!f2Uodg^A=>Lv|n-n31Gs0>3@ z6`{x(gIB@}=@Brd;OYsmU-pu`j#giN{C8k|J?sCk@UfkV?Y#+mKLE(4eRR`Za^D z>#(dD0xTfp2%}O8WWZXr3FnI!zLEsHY zwn#@zgx^i4C7Us#(dhL50m^@0UoXPpFq)gamQNP_-*RF6hRFLP`(NM^lF{KoZ6Yy(iSbc1HC;VGQ-xe2gsby) zL1_^n!R24R^jnNlkUuooPnV@dy@>h&O^p+-aE`t-<(EJ~!O9-XbPQFIU{N9B{YuU< zt~sywPx#%>e + + + + + Fedora Mirrors Map + + + + +

Fedora Mirrors Map

+
+ + + + + + From b0af68b5f9c8c184473cf3e64ab7c3b7e41da8fb Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 17 Dec 2015 20:38:18 +0000 Subject: [PATCH 23/32] Install files for interactive mirror map The necessary files for the interactive mirror are taken from the membership-map directory where they already exist. Signed-off-by: Adrian Reber --- roles/mirrormanager/frontend2/tasks/main.yml | 32 +++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/roles/mirrormanager/frontend2/tasks/main.yml b/roles/mirrormanager/frontend2/tasks/main.yml index 68497d3e81..641d56b2bb 100644 --- a/roles/mirrormanager/frontend2/tasks/main.yml +++ b/roles/mirrormanager/frontend2/tasks/main.yml @@ -71,6 +71,9 @@ - /var/www/mirrormanager-statistics/data - /var/www/mirrormanager-statistics/data/propagation - /var/www/mirrormanager-statistics/map + - /var/www/mirrormanager-statistics/map/img + - /var/www/mirrormanager-statistics/map/theme + - /var/www/mirrormanager-statistics/map/theme/default tags: - mm2_frontend - config @@ -86,7 +89,6 @@ - /var/log/mirrormanager/crawler - /var/www/mirrormanager-statistics - /var/www/mirrormanager-statistics/data - - /var/www/mirrormanager-statistics/data/propagation - /var/www/mirrormanager-statistics/map tags: - mm2_frontend @@ -118,3 +120,31 @@ - mm2_frontend - config +- name: install interactive map file + copy: src={{ roles }}/membership-map/build/files/www/{{ item }} + dest=/var/www/mirrormanager-statistics/map/{{ item }} + owner=mirrormanager group=mirrormanager mode=0444 + with_items: + - OpenLayers.js + - img/east-mini.png + - img/layer-switcher-maximize.png + - img/layer-switcher-minimize.png + - img/north-mini.png + - img/slider.png + - img/south-mini.png + - img/west-mini.png + - img/zoombar.png + - img/zoom-minus-mini.png + - img/zoom-plus-mini.png + - theme/default/style.css + tags: + - mm2_frontend + +- name: install interactive map file + copy: src={{ item }} dest=/var/www/mirrormanager-statistics/map/{{ item }} + owner=mirrormanager group=mirrormanager mode=0444 + with_items: + - mirrors.html + - f-dot.png + tags: + - mm2_frontend From a21c831e1c859e1340fec3c1a63cf543fc2020c8 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 17 Dec 2015 20:39:56 +0000 Subject: [PATCH 24/32] Install and activate cronjob for daily mirror map creation Signed-off-by: Adrian Reber --- roles/mirrormanager/backend/tasks/main.yml | 6 ++++++ .../backend/templates/create_maps.sh | 15 +++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 roles/mirrormanager/backend/templates/create_maps.sh diff --git a/roles/mirrormanager/backend/tasks/main.yml b/roles/mirrormanager/backend/tasks/main.yml index 8b817af880..763dd82c0e 100644 --- a/roles/mirrormanager/backend/tasks/main.yml +++ b/roles/mirrormanager/backend/tasks/main.yml @@ -55,12 +55,18 @@ with_items: - sync_pkl_to_mirrorlists.sh - handle_propagation.sh + - create_maps.sh - name: handle propagation cronjob cron: name="handle-propagation" minute="25,55" hour="*" user="mirrormanager" job="/usr/local/bin/handle_propagation.sh" cron_file=handle-propagation +- name: create worldmap cronjob + cron: name="create-worldmap" minute="50" hour="20" user="mirrormanager" + job="/usr/local/bin/create-maps.sh" + cron_file=create-worldmap + - name: setup /var/lib/mirrormanager/.ssh directory copy: > src="{{ private }}/files/mirrormanager/" diff --git a/roles/mirrormanager/backend/templates/create_maps.sh b/roles/mirrormanager/backend/templates/create_maps.sh new file mode 100644 index 0000000000..a3451838ab --- /dev/null +++ b/roles/mirrormanager/backend/templates/create_maps.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +WORLDMAP="/usr/bin/mm2_generate-worldmap" + +FRONTENDS="{% for host in groups['mm-frontend'] %} {{ host }} {% endfor %}" + +OUTPUT=`mktemp -d` + +trap "rm -f ${OUTPUT}/*; rmdir ${OUTPUT}" QUIT TERM INT HUP EXIT + +${WORLDMAP} --output ${OUTPUT} > /dev/null + +for f in ${FRONTENDS}; do + rsync -aq ${OUTPUT}/ ${f}:/var/www/mirrormanager-statistics/map +done From 57998073aeed82ea3a3e3a9cf894e39d598cf9fd Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 17 Dec 2015 20:40:37 +0000 Subject: [PATCH 25/32] Enable mirror map Signed-off-by: Adrian Reber --- roles/mirrormanager/frontend2/templates/mirrormanager2.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mirrormanager/frontend2/templates/mirrormanager2.cfg b/roles/mirrormanager/frontend2/templates/mirrormanager2.cfg index 512224ab7f..0c57cb3a88 100644 --- a/roles/mirrormanager/frontend2/templates/mirrormanager2.cfg +++ b/roles/mirrormanager/frontend2/templates/mirrormanager2.cfg @@ -86,7 +86,7 @@ EMBARGOED_COUNTRIES = ['CU', 'IR', 'KP', 'SD', 'SY'] # When this is set to True, an additional menu item is shown which # displays the maps generated with mm2_generate-worldmap. -SHOW_MAPS = False +SHOW_MAPS = True # Location of the static map displayed in the map tab. STATIC_MAP = '/map/map.png' From 9cb99d476fb3c890a1369c9c5ff665ca937e4aa7 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 17 Dec 2015 20:55:48 +0000 Subject: [PATCH 26/32] '_' and not '-' --- roles/mirrormanager/backend/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mirrormanager/backend/tasks/main.yml b/roles/mirrormanager/backend/tasks/main.yml index 763dd82c0e..e0deb35771 100644 --- a/roles/mirrormanager/backend/tasks/main.yml +++ b/roles/mirrormanager/backend/tasks/main.yml @@ -64,7 +64,7 @@ - name: create worldmap cronjob cron: name="create-worldmap" minute="50" hour="20" user="mirrormanager" - job="/usr/local/bin/create-maps.sh" + job="/usr/local/bin/create_maps.sh" cron_file=create-worldmap - name: setup /var/lib/mirrormanager/.ssh directory From b5b0826fa40076ad674a672eb2addfd0d462731e Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 17 Dec 2015 21:07:33 +0000 Subject: [PATCH 27/32] Explicitly list the files to transfer. --- roles/mirrormanager/backend/templates/create_maps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mirrormanager/backend/templates/create_maps.sh b/roles/mirrormanager/backend/templates/create_maps.sh index a3451838ab..2fe0bdc8bf 100644 --- a/roles/mirrormanager/backend/templates/create_maps.sh +++ b/roles/mirrormanager/backend/templates/create_maps.sh @@ -11,5 +11,5 @@ trap "rm -f ${OUTPUT}/*; rmdir ${OUTPUT}" QUIT TERM INT HUP EXIT ${WORLDMAP} --output ${OUTPUT} > /dev/null for f in ${FRONTENDS}; do - rsync -aq ${OUTPUT}/ ${f}:/var/www/mirrormanager-statistics/map + rsync -aq ${OUTPUT}/{map.png,mirrors_location.txt} ${f}:/var/www/mirrormanager-statistics/map/ done From 3373f9938d3259c740dd9e658afc6f144d834365 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 17 Dec 2015 13:29:16 -0800 Subject: [PATCH 28/32] openqa_server: switch to createhdds.py, disable creation for now This puts in place the bits needed to use the new createhdds.py for image generation, which works much nicer with ansible than the old createhdds.sh. For now, the disk creation step is disabled, because creating some images (including the ones that get refreshed regularly) requires running VMs, and the openqa server hosts are VMs themselves and do not currently have nested virt enabled, so the creation would run extremely slow. Once we get nested virt enabled, I'll change the condition for the image creation step to what it should be. Until then I'll carry on handling image creation manually (both hosts have all the images at present anyhow). --- roles/openqa/server/tasks/main.yml | 45 ++++++++++-------------------- 1 file changed, 14 insertions(+), 31 deletions(-) diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml index 07ea66a8a6..43f1466401 100644 --- a/roles/openqa/server/tasks/main.yml +++ b/roles/openqa/server/tasks/main.yml @@ -83,42 +83,25 @@ - /var/lib/openqa/share/factory/hdd - /var/lib/openqa/share/factory/repo -# NOTE: this is very hacky, but we can't do much better with the current -# disk creation script, I will try and make it better. We'll have to bump -# this hardcoded release number every so often. Much better createhdds -# is in review: https://phab.qadevel.cloud.fedoraproject.org/D687 -# LIBGUESTFS_BACKEND is to avoid the need to run libvirt just for this +- name: Check if any hard disk images need (re)building + command: "/root/openqa_fedora_tools/tools/createhdds.py check" + args: + chdir: /var/lib/openqa/share/factory/hdd/ + register: diskcheck + failed_when: "1 != 1" + always_run: true + - name: Create hard disk images (this may take a long time!) - command: "/root/openqa_fedora_tools/tools/createhdds.sh 23" + command: "/root/openqa_fedora_tools/tools/createhdds.py all --clean" args: - creates: /var/lib/openqa/share/factory/hdd/disk_full_mbr.img - chdir: /var/lib/openqa/share/factory/hdd/ - environment: - LIBGUESTFS_BACKEND: direct - -- name: Create N-2 desktop x86_64 disk image (this may take a long time!) - command: "/root/openqa_fedora_tools/tools/createhdds.sh 22 desktop_64bit" - args: - creates: /var/lib/openqa/share/factory/hdd/disk_f22_desktop_x86_64.img - chdir: /var/lib/openqa/share/factory/hdd/ - environment: - LIBGUESTFS_BACKEND: direct - -- name: Create N-2 desktop i686 disk image (this may take a long time!) - command: "/root/openqa_fedora_tools/tools/createhdds.sh 22 desktop_32bit" - args: - creates: /var/lib/openqa/share/factory/hdd/disk_f22_desktop_i686.img - chdir: /var/lib/openqa/share/factory/hdd/ - environment: - LIBGUESTFS_BACKEND: direct - -- name: Create N-2 minimal x86_64 disk image (this may take a long time!) - command: "/root/openqa_fedora_tools/tools/createhdds.sh 22 minimal_64bit" - args: - creates: /var/lib/openqa/share/factory/hdd/disk_f22_minimal_x86_64.img chdir: /var/lib/openqa/share/factory/hdd/ environment: LIBGUESTFS_BACKEND: direct + # This is disabled until we enable nested virt on the server VMs; + # image creation involves running VMs and takes *forever* without + # KVM acceleration. Once we turn it on, the condition should be + # "diskcheck.rc > 0". + when: "1 != 1" - name: Create exports file copy: src=exports dest=/etc/exports.d/openqa.exports owner=root group=root mode=0644 From 37e6e4d939fb9448fbe64e2d2e37e29f3f2def7b Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Thu, 17 Dec 2015 21:51:59 +0000 Subject: [PATCH 29/32] and when the perms are right, might cthulhu will awake and merge stats --- playbooks/groups/logserver.yml | 4 ++++ playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/playbooks/groups/logserver.yml b/playbooks/groups/logserver.yml index f90fc228eb..9d26642187 100644 --- a/playbooks/groups/logserver.yml +++ b/playbooks/groups/logserver.yml @@ -39,3 +39,7 @@ roles: - cloudstats + + - role: nfs/client + mnt_dir: '/mnt/fedora_stats' + nfs_src_dir: 'fedora_stats' diff --git a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml index 0b62c5c65a..0d4990ee07 100644 --- a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml +++ b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml @@ -42,7 +42,7 @@ - include: "{{ handlers }}/restart_services.yml" roles: - - { role: nfs/client, mnt_dir: '/srv/fedora_stats', nfs_src_dir: 'fedora_stats' } + - { role: nfs/client, mnt_dir: '/mnt/fedora_stats', nfs_src_dir: 'fedora_stats' } - geoip tasks: From 2bca286974c34223df240e31e03e73db3bc4e6e2 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 17 Dec 2015 21:54:17 +0000 Subject: [PATCH 30/32] Make genacls.sh a template. --- roles/distgit/tasks/main.yml | 2 +- roles/distgit/{files => templates}/genacls.sh | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename roles/distgit/{files => templates}/genacls.sh (100%) diff --git a/roles/distgit/tasks/main.yml b/roles/distgit/tasks/main.yml index f260dca56c..a78d77683c 100644 --- a/roles/distgit/tasks/main.yml +++ b/roles/distgit/tasks/main.yml @@ -152,7 +152,7 @@ - distgit - name: install the genacls.sh script - copy: src={{item}} dest=/usr/local/bin/{{item}} mode=0755 + template: src={{item}} dest=/usr/local/bin/{{item}} mode=0755 with_items: - genacls.sh tags: diff --git a/roles/distgit/files/genacls.sh b/roles/distgit/templates/genacls.sh similarity index 100% rename from roles/distgit/files/genacls.sh rename to roles/distgit/templates/genacls.sh From 0a5ca36a62deacf54d8b6a458f7a60307478736e Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 17 Dec 2015 21:57:13 +0000 Subject: [PATCH 31/32] Modify gl-conf in staging for dist-git acls. --- roles/distgit/templates/genacls.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/roles/distgit/templates/genacls.sh b/roles/distgit/templates/genacls.sh index fb1c5c0abc..1efad29c4b 100644 --- a/roles/distgit/templates/genacls.sh +++ b/roles/distgit/templates/genacls.sh @@ -11,8 +11,23 @@ if /usr/local/bin/genacls.pkgdb > gitolite.conf ; then mv gitolite.conf /etc/gitolite/conf/ chown gen-acls:gen-acls -R /etc/gitolite/conf/ HOME=/srv/git /usr/bin/gitolite compile + +{% if env == 'staging' %} + # After compiling, we have to stick some magic into the gl-conf files of + # every repo so that gitolite will understand our symlinks from rpms/ + cd /srv/git/repositories + for repodir in *.git; do + # Strip off the '.git' on the end. + repo=${repodir::-4} + glconf=$repodir/gl-conf; + echo '$one_config{"'$repo'"} = $one_config{"rpms/'$repo'"};' >> $repodir/gl-conf; + echo '$one_repo{"'$repo'"} = $one_repo{"rpms/'$repo'"};' >> $repodir/gl-conf; + done +{% endif %} fi + cd / + rm -rf $TEMPDIR chown root:packager /etc/gitolite/conf/gitolite.conf-compiled.pm chmod g+r /etc/gitolite/conf/gitolite.conf-compiled.pm From 2c8e7b7cf2e343c770a53ff0a9e1b9eb6d610812 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 17 Dec 2015 22:08:50 +0000 Subject: [PATCH 32/32] Add vars for this as well. --- .../aarch64-02a.arm.fedoraproject.org | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 inventory/host_vars/aarch64-02a.arm.fedoraproject.org diff --git a/inventory/host_vars/aarch64-02a.arm.fedoraproject.org b/inventory/host_vars/aarch64-02a.arm.fedoraproject.org new file mode 100644 index 0000000000..ef6efb066d --- /dev/null +++ b/inventory/host_vars/aarch64-02a.arm.fedoraproject.org @@ -0,0 +1,25 @@ +fas_client_groups: sysadmin-noc,sysadmin-releng + +kojipkgs_url: armpkgs.fedoraproject.org +kojihub_url: arm.koji.fedoraproject.org/kojihub +kojihub_scheme: https + +koji_server_url: "http://arm.koji.fedoraproject.org/kojihub" +koji_weburl: "http://arm.koji.fedoraproject.org/koji" +koji_topurl: "http://armpkgs.fedoraproject.org/" + +nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3,rsize=32768,wsize=32768 + +fedmsg_certs: +- service: releng + owner: root + group: sysadmin-releng + can_send: + # pungi-koji stuff (ask dgilmore) + - pungi.compose.phase.start + - pungi.compose.phase.stop + - pungi.compose.status.change + - pungi.compose.createiso.targets + - pungi.compose.createiso.imagefail + - pungi.compose.createiso.imagedone +