Merge branch 'master' of /git/ansible

henrysher · Jul 30, 2016 · 8fccd00 · 8fccd00
2 parents 8feabc9 + 8c1c852
commit 8fccd00
Show file tree

Hide file tree

Showing 10 changed files with 403 additions and 23 deletions.
diff --git a/inventory/group_vars/jenkins-slave b/inventory/group_vars/jenkins-slave
@@ -27,7 +27,6 @@ slave_packages_common:
 - python-nose
 - python-BeautifulSoup
 - python-fedora
-- python2-unittest2
 - python-pep8
 - python-psycopg2
 - postgresql-devel   # Required to install python-psycopg2 w/in a venv
@@ -45,13 +44,11 @@ slave_packages_common:
 - openssl-devel      # Required by bodhi/cffi/cryptography
 - redis              # Required by copr
 - createrepo_c       # Required by bodhi2
-- python2-createrepo_c       # Required by bodhi2
 - python-straight-plugin
 - pyflakes           # Requested by user rholy (ticket #4175)
 - koji               # Required by koschei (ticket #4852) and pyrpkg (ticket #4838)
 - rpm-python         # Required by koschei (ticket #4852)
 - libgit2-devel      # Required by pagure
-- python2-pygit2     # Required by pagure
 - osbs-client        # Required by pyrpkg (ticket #4838)
 - intltool           # Required by fedora-comps (ticket #5307)
 - fedpkg             # Required by fedora-kickstarts (ticket #5406)
@@ -161,7 +158,6 @@ slave_packages_fedora:
 - krb5-server
 - socket_wrapper
 - nss_wrapper
-- python-requests-kerberos
 - krb5-workstation
 - python-sssdconfig
 - mod_ssl
@@ -193,6 +189,9 @@ slave_packages_fedora:
 - rubygem-thor
 - rubygems
 - rubypick
+- python2-unittest2
+- python2-createrepo_c       # Required by bodhi2
+- python2-pygit2     # Required by pagure
 
 # Packages installed only on CentOS Jenkins slaves
 slave_packages_centos:
@@ -206,13 +205,18 @@ el7_only:
 - python-hawkey      # Required by koschei (ticket #4852)
 - python-librepo     # Required by koschei (ticket #4852)
 - nosync             # for use in mock
+- python-unittest2
+- python-createrepo_c       # Required by bodhi2
+- python-pygit2     # Required by pagure
 
 # Packages only available in f23+
 f23_only:
 - mod_auth_openidc
 - python2-solv       # For modulemd-resolver. (ticket #5349)
 - python3-solv       # For modulemd-resolver. (ticket #5349)
+- python-requests-kerberos
 
 # Packages only available/needed in f24+
 f24_only:
 - python2-systemd
+- python2-requests-kerberos
diff --git a/playbooks/groups/jenkins-slave.yml b/playbooks/groups/jenkins-slave.yml
@@ -28,6 +28,7 @@
 
 - name: provision instance
   hosts: jenkins-slave
+  gather_facts: True
   vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"

diff --git a/roles/distgit/pagure/templates/pagure.cfg b/roles/distgit/pagure/templates/pagure.cfg
@@ -174,6 +174,7 @@ ENABLE_NEW_PROJECTS = False
 ENABLE_DEL_PROJECTS = False
 ENABLE_TICKETS = False
 ENABLE_USER_MNGT = False
+ALLOWED_PREFIX = ['rpms', 'modules', 'docker']
 
 DISABLED_PLUGINS = ['IRC', 'Pagure tickets', 'Read the Doc']
 

diff --git a/roles/distgit/tasks/main.yml b/roles/distgit/tasks/main.yml
@@ -186,6 +186,17 @@
             owner=root group=root mode=0755
   with_items:
     - genacls.pkgdb
+  when: env != "staging"
+  tags:
+  - config
+  - distgit
+
+- name: install the genacls.pkgdb scripts
+  template: src={{item}} dest=/usr/local/bin/genacls.pkgdb
+            owner=root group=root mode=0755
+  with_items:
+    - genacls.pkgdb.stg
+  when: env == "staging"
   tags:
   - config
   - distgit

diff --git a/roles/distgit/templates/genacls.pkgdb b/roles/distgit/templates/genacls.pkgdb
@@ -38,7 +38,7 @@ if __name__ == '__main__':
         'F-11': 'f11', 'F-12': 'f12', 'F-13': 'f13', 'f14': 'f14', 'f15':
         'f15', 'f16': 'f16', 'f17': 'f17', 'f18': 'f18', 'f19': 'f19',
         'f20': 'f20', 'f21': 'f21', 'f22': 'f22', 'f23': 'f23', 'f24': 'f24',
-	'f25': 'f25',
+        'f25': 'f25',
         'devel': 'master', 'master': 'master'}
 
     # Create a "regex"ish list 0f the reserved branches