Try using a jinja2 "default" filter.

This commit is contained in:
Ralph Bean 2014-07-10 19:11:31 +00:00
parent ab65c8aeb7
commit 074dd3f17a
3 changed files with 4 additions and 6 deletions

View file

@ -5,8 +5,6 @@ fedmsg_certs:
- service: shell - service: shell
owner: root owner: root
group: root group: root
ansible_fqdn: jenkins.cloud.fedoraproject.org
- service: jenkins - service: jenkins
owner: root owner: root
group: jenkins group: jenkins
ansible_fqdn: jenkins.cloud.fedoraproject.org

View file

@ -29,7 +29,6 @@
roles: roles:
- base - base
- fedmsg/base
tasks: tasks:
- include: "{{ tasks }}/cloud_setup_basic.yml" - include: "{{ tasks }}/cloud_setup_basic.yml"
@ -238,7 +237,8 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- fedmsg/base - name: fedmsg/base
fedmsg_fqdn: jenkins.cloud.fedoraproject.org
handlers: handlers:
- include: "{{ handlers }}/restart_services.yml" - include: "{{ handlers }}/restart_services.yml"

View file

@ -76,7 +76,7 @@
- name: fedmsg certs - name: fedmsg certs
copy: > copy: >
src="{{ private }}/files/fedmsg-certs/keys/{{item['service']}}-{{ansible_fqdn}}.crt" src="{{ private }}/files/fedmsg-certs/keys/{{item['service']}}-{{fedmsg_fqdn | default(ansible_fqdn)}}.crt"
dest=/etc/pki/fedmsg/ dest=/etc/pki/fedmsg/
mode=644 mode=644
owner={{item['owner']}} owner={{item['owner']}}
@ -89,7 +89,7 @@
- name: fedmsg keys - name: fedmsg keys
copy: > copy: >
src="{{ private }}/files/fedmsg-certs/keys/{{item['service']}}-{{ansible_fqdn}}.key" src="{{ private }}/files/fedmsg-certs/keys/{{item['service']}}-{{fedmsg_fqdn | default(ansible_fqdn)}}.key"
dest=/etc/pki/fedmsg/ dest=/etc/pki/fedmsg/
mode=0640 mode=0640
owner={{item['owner']}} owner={{item['owner']}}