Infrastructure/ansible
1
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:
Rick Elrod 2017-07-19 21:15:10 +00:00
commit 764ca81e0d
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
playbooks/groups/osbs-orchestrator-cluster.yml
View file

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

2
roles/pkgdb2/files/fas2.py
View file

@ -267,6 +267,8 @@ class AccountSystem(BaseClient):
115389: 'amitshah@fedoraproject.org', 115389: 'amitshah@fedoraproject.org',
# Mark Wielard: fedora@wildebeest.org # Mark Wielard: fedora@wildebeest.org
102697: 'mjw@fedoraproject.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 # 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