Merge branch 'master' of /git/ansible

files/scripts/create-filelist

@@ -36,7 +36,7 @@ def sha1(fname):
     return sha1.hexdigest()
 
 
-def recursedir(path='.', skip=[]):
+def recursedir(path='.', skip=[], alwaysskip=['.~tmp~']):
     """Just like scandir, but recursively.
 
     Will skip everything in the skip array, but only at the top level
@@ -45,8 +45,11 @@ def recursedir(path='.', skip=[]):
     for entry in scandir(path):
         if entry.name in skip:
             continue
+        if entry.name in alwaysskip:
+            continue
         if entry.is_dir(follow_symlinks=False):
-            for rentry in recursedir(entry.path):
+            # Don't pass skip here, because we only skip in the top level
+            for rentry in recursedir(entry.path, alwaysskip=alwaysskip):
                 yield rentry
         yield entry
 
@@ -60,16 +63,16 @@ def parseopts():
     p.add_argument('-C', '--checksum-file', action='append', dest='checksum_files',
                    help='Include checksums of all instances of the specified file.')
     p.add_argument('-s', '--skip', action='store_true',
-                   help='Skip fullfiletimelist in the top directory')
+                   help='Skip the --filelist file in the top directory')
     p.add_argument('-S', '--skip-file', action='append', dest='skip_files',
                    help='Skip the specified file in the top directory.')
 
     p.add_argument('-d', '--dir', help='Directory to scan (default: .).')
 
     p.add_argument('-t', '--timelist', type=argparse.FileType('w'), default=sys.stdout,
-                   help='Filename of the file list with times (default: fullfiletimelist).')
+                   help='Filename of the file list with times (default: stdout).')
     p.add_argument('-f', '--filelist', type=argparse.FileType('w'), default=null,
-                   help='Filename of the file list without times (default: fullfilelist).')
+                   help='Filename of the file list without times (default: no plain file list is generated).')
 
     opts = p.parse_args()
 
@@ -82,7 +85,8 @@ def parseopts():
 
     opts.skip_files = opts.skip_files or []
     if opts.skip:
-        opts.skip_files += ['fullfiletimelist']
+        if not opts.timelist.name == '<stdout>':
+            opts.skip_files += [opts.timelist.name]
 
     return opts
 

files/scripts/update-fullfiletimelist

@@ -14,7 +14,7 @@ fi
 CREATE=/usr/local/bin/create-filelist
 
 # A single lockfile for everything we're modifying
-LOCKFILE=.lock.create-filelist
+LOCKFILE=/srv/.lock.create-filelist
 
 # The directory where all of the modules live
 TOPD=/srv/pub

inventory/group_vars/atomichw

@@ -1,16 +0,0 @@
----
-host_group: atomicbuilder
-freezes: false
-nrpe_procs_warn: 700
-nrpe_procs_crit: 800
-
-fas_client_groups: atomic,sysadmin-atomic
-
-tcp_ports: [ 80, 443, 873 ]
-
-# Just blacklist this for now as it has a eth1 we do not want to configure.
-ansible_ifcfg_blacklist: true
-
-eth0_ip: 10.5.124.150
-eth0_nm: 255.255.255.128
-gw: 10.5.124.254

inventory/group_vars/copr-front-stg

@@ -2,6 +2,6 @@
 copr_frontend_public_hostname: "copr-fe-dev.cloud.fedoraproject.org"
 
 csi_security_category: Low
-csi_primary_contact: msuchy (mirek, vgologuz) | IRC #fedora-admin, #fedora-buildsys
+csi_primary_contact: msuchy (mirek), clime | IRC #fedora-admin, #fedora-buildsys
 csi_purpose: Provide the testing environment of copr's frontend
 csi_relationship: This host is the testing environment for copr's web interface

inventory/host_vars/compose-s390-01.s390.fedoraproject.org

@@ -14,7 +14,7 @@ main_bridge: br1
 koji_hub_nfs: "fedora_s390/data"
 
 kojipkgs_url: s390pkgs.fedoraproject.org
-kojihub_url: 390koji.fedoraproject.org/kojihub
+kojihub_url: s390.koji.fedoraproject.org/kojihub
 kojihub_scheme: https
 
 koji_server_url: "http://s390.koji.fedoraproject.org/kojihub"

inventory/host_vars/copr-be-dev.cloud.fedoraproject.org

@@ -7,7 +7,7 @@ security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywh
 zone: nova
 hostbase: copr-be-dev-
 public_ip: 209.132.184.53
-root_auth_users: msuchy pingou vgologuz frostyx asamalik clime
+root_auth_users: msuchy pingou frostyx asamalik clime
 description: copr dispatcher and repo server - dev instance
 tcp_ports: ['22', '80', '443']
 # volumes: copr-be-dev-data

inventory/host_vars/copr-dist-git-dev.fedorainfracloud.org

@@ -7,7 +7,7 @@ security_group: web-80-anywhere-persistent,ssh-anywhere-persistent,default
 zone: nova
 hostbase: copr-dist-git-dev-
 public_ip: 209.132.184.179
-root_auth_users:  ryanlerch pingou msuchy asamalik vgologuz frostyx clime
+root_auth_users:  ryanlerch pingou msuchy asamalik frostyx clime
 description: dist-git for copr service - dev instance
 tcp_ports: [22, 80]
 # volumes:  copr-dist-git-dev

inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org

@@ -7,7 +7,7 @@ security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywh
 zone: nova
 hostbase: copr-fe-dev-
 public_ip: 209.132.184.55
-root_auth_users:  ryanlerch pingou msuchy asamalik vgologuz frostyx clime
+root_auth_users:  ryanlerch pingou msuchy asamalik frostyx clime
 description: copr frontend server - dev instance
 tcp_ports: [22, 80, 443]
 # volumes: copr-fe-dev-db

inventory/inventory

@@ -61,9 +61,6 @@ ask02.phx2.fedoraproject.org
 [ask-stg]
 ask01.stg.phx2.fedoraproject.org
 
-[atomichw]
-atomic01.qa.fedoraproject.org
-
 [backup]
 backup01.phx2.fedoraproject.org
 

master.yml

@@ -16,7 +16,6 @@
 - include: /srv/web/infra/ansible/playbooks/groups/arm-packager.yml
 - include: /srv/web/infra/ansible/playbooks/groups/arm-qa.yml
 - include: /srv/web/infra/ansible/playbooks/groups/ask.yml
-- include: /srv/web/infra/ansible/playbooks/groups/atomic.yml
 - include: /srv/web/infra/ansible/playbooks/groups/autocloud-backend.yml  
 - include: /srv/web/infra/ansible/playbooks/groups/autocloud-web.yml
 - include: /srv/web/infra/ansible/playbooks/groups/autosign.yml

playbooks/groups/atomic.yml

@@ -1,27 +0,0 @@
-#
-# I am guessing that this box will be like other hw boxes.
-#
-
-- name: Build an atomic server. 
-  hosts: atomic01.qa.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:
-  - base
-  - hosts
-  - fas_client
-  - sudo
-
-  tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
-
-  handlers:
-  - include: "{{ handlers }}/restart_services.yml"

playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml

@@ -747,7 +747,6 @@
       - { name: samkottler, email: 'samkottler@fedoraproject.org', tenant: infrastructure, password: "{{samkottler_password}}" }
       - { name: tflink, email: 'tflink@fedoraproject.org', tenant: qa, password: "{{tflink_password}}" }
       - { name: twisted, email: 'buildbot@twistedmatrix.com', tenant: pythonbots, password: "{{twisted_password}}" }
-      - { name: vgologuz, email: 'vgologuz@redhat.com', tenant: copr, password: "{{vgologuz_password}}" }
       - { name: roshi, email: 'roshi@fedoraproject.org', tenant: qa, password: "{{roshi_password}}" }
       - { name: maxamillion, email: 'maxamillion@fedoraproject.org', tenant: infrastructure, password: "{{maxamillion_password}}" }
       - { name: clime, email: 'clime@redhat.com', tenant: copr, password: "{{clime_password}}" }
@@ -845,7 +844,6 @@
       - { user: puiterwijk, tenant: transient }
       - { user: mizdebsk, tenant: infrastructure }
       - { user: mizdebsk, tenant: transient }
-      - { user: vgologuz, tenant: coprdev }
       - { user: clime, tenant: coprdev }
     tags:
      - openstack_users

playbooks/hosts/piwik.fedorainfracloud.org.yml

@@ -20,12 +20,16 @@
    - /srv/private/ansible/files/openstack/passwords.yml
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
+  handlers:
+  - include: "{{ handlers }}/restart_services.yml"
+
   roles:
   - sudo
   - hosts
   - apache
   - base
   - piwik
+  - nagios/client
 
   pre_tasks:
   - include: "{{ tasks }}/yumrepos.yml"

roles/copr/frontend/tasks/main.yml

@@ -85,7 +85,6 @@
   - spot
   - nb
   - kevin
-  - vgologuz
 
 - name: rebuild indexes
   command: ./manage.py update_indexes

roles/fedmsg/base/templates/logging.py.j2

@@ -76,8 +76,43 @@ class ContextInjector(logging.Filter):
         if seen_errors[key] > error_limit:
             record.farewell = radio_silence % error_limit
 
+        msg_id = ""
+        try:
+            msg = self.get_msg_object()
+            if isinstance(msg, dict):
+                if 'msg_id' in msg:
+                    msg_id = msg['msg_id']
+                elif 'msg' in msg:
+                    if 'msg_id' in msg['msg']:
+                        msg_id = msg['msg']['msg_id']
+        except:
+            pass
+
+        record.msg_id = msg_id
+
         return True
 
+    @staticmethod
+    def get_msg_object():
+        """ Return the current request object
+
+        This is insane.
+
+        There is no way to know the actual fedmsg message at this point in
+        the code, so we're crawling our way down the call stack until we
+        find the first place with a 'msg' local instance variable and
+        attempt to extract the msg_id from it (later).
+
+        Please forgive me (and Ralph, the original author of this code).
+        """
+
+        for frame in (f[0] for f in reversed(inspect.stack())):
+            if 'msg' in frame.f_locals:
+                return frame.f_locals['msg']
+
+        # This code is reached if there's no Request. Most common case is trac-admin
+        return None
+
     @staticmethod
     def format_callstack():
         for i, frame in enumerate(f[0] for f in inspect.stack()):
@@ -126,6 +161,7 @@ host:     %(host)s
 PID:      %(pid)s
 name:     %(proc_name)s
 command:  %(command_line)s
+msg_id:   %(msg_id)s
 
 Callstack that lead to the logging statement
 --------------------------------------------

roles/koschei/backend/templates/config-backend.cfg.j2

@@ -19,32 +19,21 @@ config = {
             "ca": "/etc/koschei/fedora-ca.cert",
             "serverca": "/etc/koschei/fedora-ca.cert",
         },
-        "source_tag": "{{ koschei_koji_tag }}",
-        "target_tag": "{{ koschei_koji_tag }}",
-        "build_tag": "{{ koschei_koji_tag }}-build",
         "max_builds": 40,
         "build_arches": ['i386', 'x86_64', 'armhfp'],
-        "build_opts": {
-        },
         "load_threshold": 0.65,
         "task_priority": 30,
-        "repo_url": "http://{{ koschei_kojipkgs }}/repos/{build_tag}/{repo_id}/{arch}",
     },
     "dependency": {
         "build_group": "build",
         "for_arch": "x86_64",
         "repo_cache_items": 10,
-        "keep_build_deps_for": 1,
-        "local": False,
         "arches": ['x86_64', 'i386'],
         "persist_chunk_size": 300,
         "resolver_queue_size": 100,
         "dependency_fetch_chunk_size": 150,
-        "cache_l1_capacity": 3,
-        "cache_l2_capacity": 50,
-        "cache_l1_threads": 3,
-        "cache_l2_threads": 1,
-        "cache_threads_max": 4,
+        "dependency_cache_capacity": 50000,
+        "cache_l2_capacity": 100,
         "ignore_weak_deps": True,
     },
     "services": {

roles/mediawiki/templates/LocalSettings.php.fp.j2

@@ -381,6 +381,10 @@ $wgSquidServersNoPurge = array(
     "140.211.169.196",
     "192.168.1.63",
 
+    # proxy07
+    "174.141.234.172",
+    "192.168.1.52",
+
     # proxy08
     "67.203.2.67",
     "2607:f188::dead:beef:cafe:fed1",
@@ -423,6 +427,8 @@ $wgSquidServers = array(
     "192.168.1.25:6081",
     # proxy06
     "192.168.1.63:6081",
+    # proxy07
+    "192.168.1.52:6081",
     # proxy08
     "192.168.1.78:6081",
     # proxy10

roles/mirrormanager/frontend2/tasks/main.yml

@@ -112,7 +112,7 @@
   tags:
   - config
   - mm2_frontend
-  when: env != "staging"
+  when: env != "staging" and inventory_hostname.startswith('mm-frontend0')
 
 # mirrormanager user ssh key(s) (used to transfer statistics from backend to frontends)
 - name: add authorized_keys for mirrormanager

roles/releng/files/aarch64.branched

@@ -1,3 +1,3 @@
 # branched devel compose
 MAILTO=releng-cron@lists.fedoraproject.org
-15 7 * * * root TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f24-secondary-arch && LANG=en_US.UTF-8 ./nightly.sh arm
+#15 7 * * * root TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f24-secondary-arch && LANG=en_US.UTF-8 ./nightly.sh arm

roles/releng/files/power64.branched

@@ -1,3 +1,3 @@
 # branched devel compose
 MAILTO=releng-cron@lists.fedoraproject.org
-15 7 * * * root TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f24-secondary-arch && LANG=en_US.UTF-8 ./nightly.sh ppc
+#15 7 * * * root TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f24-secondary-arch && LANG=en_US.UTF-8 ./nightly.sh ppc

roles/releng/files/s390.branched

@@ -1,3 +1,3 @@
 # branched devel compose
 MAILTO=releng-cron@lists.fedoraproject.org
-15 10 * * * root TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f24-secondary-arch && LANG=en_US.UTF-8 ./nightly.sh s390
+#15 10 * * * root TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f24-secondary-arch && LANG=en_US.UTF-8 ./nightly.sh s390

roles/taskotron/taskotron-client/files/yumrepoinfo.conf

@@ -38,9 +38,9 @@ release_status = rawhide
 
 # Fedora 24
 [f24]
-url = %(rawhideurl)s
-path = development/24
-release_status = branched
+url = %(goldurl)s
+path = 24
+release_status = stable
 
 [f24-updates]
 url = %(updatesurl)s

roles/taskotron/taskotron-client/templates/namespaces.yaml.j2

@@ -4,12 +4,12 @@ namespaces_safe:
 
 # A list of git repos that are allowed to post a result into a particular namespace
 namespaces_whitelist:
-    qa:
+    dist:
         # due to a bug in libtaskotron, list all repos instead of prefix
         #- {{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/
         - {{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/rpmlint/
         - {{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/depcheck/
         - {{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/upgradepath/
-        - {{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/dockerautotest/
+        - {{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/abicheck/
     pkg:
         - git://pkgs.fedoraproject.org/rpms-checks/

roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2

@@ -27,8 +27,4 @@ namespace = rpms-checks
 
 [abicheck]
 critpath_filepath = {{ trigger_critpath_file }}
-{% if deployment_type in ['dev', 'stg'] %}
 critpath_exclude = firefox,thunderbird,kernel,kdelibs,kdepim
-{% else %}
-critpath_exclude =
-{% endif %}