Merge branch 'master' of /git/ansible

inventory/group_vars/osbs-masters-stg

@@ -32,6 +32,10 @@ osbs_conf_vendor: Fedora Project
 osbs_orchestrator_cpu_limitrange: "95m"
 osbs_orchestrator_default_nodeselector: "orchestrator=true"
 
+osbs_conf_readwrite_users:
+  - system:serviceaccount:{{ osbs_namespace }}:default
+  - system:serviceaccount:{{ osbs_namespace }}:builder
+
 nagios_Check_Services:
   nrpe: true
   sshd: true

playbooks/groups/osbs-cluster.yml

@@ -432,6 +432,7 @@
       osbs_authoritative_registry: "{{ source_registry }}"
       osbs_sources_command: "{{ osbs_conf_sources_command }}"
       osbs_vendor: "{{ osbs_conf_vendor }}"
+      osbs_readwrite_users: "{{ osbs_conf_readwrite_users }}"
       when: env == "staging"
 
 - name: setup koji secret in worker namespace
@@ -480,6 +481,7 @@
     osbs_authoritative_registry: "{{ source_registry }}"
     osbs_sources_command: "{{ osbs_conf_sources_command }}"
     osbs_vendor: "{{ osbs_conf_vendor }}"
+    osbs_readwrite_users: "{{ osbs_conf_readwrite_users }}"
     when: env == "staging"
 
 - name: setup reactor config secret in orchestrator namespace

roles/distgit/pagure/files/fas2.py

@@ -273,6 +273,8 @@ class AccountSystem(BaseClient):
             172063: 'roshi@fedoraproject.org',
             # Dusty Mabe: dusty@dustymabe.com
             170115: 'dustymabe@redhat.com',
+            # Ben Williams: vaioof@gmail.com
+            100572: 'jbwillia@math.vt.edu',
         }
         # 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