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

Allow a fedmsg cert alias for mm-backend.

Browse source
This commit is contained in:
Ralph Bean 2015-07-06 14:53:44 +00:00
parent bdbc8dd600
commit 99c6e4f840
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
inventory/group_vars/mm-backend
View file

@ -3,6 +3,7 @@ mem_size: 6144
fedmsg_certs: fedmsg_certs:
- service: shell - service: shell
alias: mirrormanager
owner: mirrormanager owner: mirrormanager
group: sysadmin group: sysadmin
can_send: can_send:

4
roles/fedmsg/base/templates/ssl.py.j2
View file

@ -15,9 +15,9 @@ config = dict(
# This is the set of certs for this host, dynamically generated from the # This is the set of certs for this host, dynamically generated from the
# ``fedmsg_certs`` host vars # ``fedmsg_certs`` host vars
{% for cert in fedmsg_certs %} {% for cert in fedmsg_certs %}
("{{cert['service']}}.{{inventory_hostname_short}}", "{{cert['service']}}-{{fedmsg_fqdn | default(ansible_fqdn)}}"), ("{{cert.get('alias', cert['service'])}}.{{inventory_hostname_short}}", "{{cert['service']}}-{{fedmsg_fqdn | default(ansible_fqdn)}}"),
{% endfor %} {% endfor %}
] + [ ] + [
# This is the beginning of the static list. We should eventually remove # This is the beginning of the static list. We should eventually remove
# this. # this.
("git.hosted03", "git-hosted03.vpn.fedoraproject.org"), ("git.hosted03", "git-hosted03.vpn.fedoraproject.org"),