Merge branch 'master' of /git/ansible

playbooks/groups/osbs-orchestrator-cluster.yml

@@ -137,6 +137,13 @@
         - NetworkManager
         - libselinux-python
         - origin
+        - python2
+        - python2-dnf
+        - libselinux-python
+        - libsemanage-python
+        - python2-firewall
+        - pyOpenSSL
+        - python-cryptography
 
     - name: Deploy controller public ssh keys to osbs cluster hosts
       authorized_key:
@@ -227,7 +234,6 @@
     openshift_shared_infra: true
     openshift_deployment_type: "origin"
     openshift_metrics_deploy: true
-    openshift_ansible_python_interpreter: "/usr/bin/python3"
     when: env == 'staging'
     tags: ['openshift-cluster','ansible-ansible-openshift-ansible']
 
@@ -252,7 +258,6 @@
     openshift_shared_infra: true
     openshift_deployment_type: "origin"
     openshift_metrics_deploy: true
-    openshift_ansible_python_interpreter: "/usr/bin/python3"
     when: env == 'staging'
     tags: ['openshift-cluster','ansible-ansible-openshift-ansible']
 

roles/pkgdb2/files/fas2.py

@@ -267,6 +267,8 @@ class AccountSystem(BaseClient):
             115389: 'amitshah@fedoraproject.org',
             # Mark Wielard: fedora@wildebeest.org
             102697: 'mjw@fedoraproject.org',
+            # Benjamin Lefoul: benjamin.lefoul@nwise.se
+            189661: 'lef@fedoraproject.org',
         }
         # A few people have an email account that is used in owners.list but
         # have setup a bugzilla account for their primary account system email