Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of /git/ansible

Browse source
This commit is contained in:
Ricky Elrod 2018-03-29 20:41:00 +00:00
commit 525d0f434d
3 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
inventory/group_vars/osbs-masters-stg
View file

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

2
playbooks/groups/osbs-cluster.yml
View file

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

2
roles/distgit/pagure/files/fas2.py
View file

@ -273,6 +273,8 @@ class AccountSystem(BaseClient):
172063: 'roshi@fedoraproject.org', 172063: 'roshi@fedoraproject.org',
# Dusty Mabe: dusty@dustymabe.com # Dusty Mabe: dusty@dustymabe.com
170115: 'dustymabe@redhat.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 # 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 # have setup a bugzilla account for their primary account system email