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

Combine properly

Browse source 
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
This commit is contained in:
Patrick Uiterwijk 2017-04-09 23:17:58 +00:00
parent 7a7054b34c
commit dc1664c8f3
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
roles/base/tasks/sshcerts.yml
View file

@ -82,7 +82,7 @@
- name: Set some extra signing facts
set_fact:
sign_hostnames: "[ '{{inventory_hostname}}' ] + ssh_hostnames | join(',')"
sign_hostnames: "{{ssh_hostnames}} + ['{{inventory_hostname}}']"
sign_validity: "-1h:+1y"
when: env == "staging"
tags:
@ -93,7 +93,7 @@
# Currently, we use the epoch as serial. That's unique enough for now
- name: Sign the certificates
command: "ssh-keygen -s {{private}}/files/ssh/staging_ca_host_key -I {{inventory_hostname}} -h -n {{ sign_hostnames }} -V {{sign_validity}} -z {{ansible_date_time.epoch}} {{pubkeydir}}/{{inventory_hostname}}{{item}}.pub"
command: "ssh-keygen -s {{private}}/files/ssh/staging_ca_host_key -I {{inventory_hostname}} -h -n {{ sign_hostnames|join(',') }} -V {{sign_validity}} -z {{ansible_date_time.epoch}} {{pubkeydir}}/{{inventory_hostname}}{{item}}.pub"
delegate_to: "batcave01.phx2.fedoraproject.org"
with_items: "{{certs_to_sign}}"
when: env == "staging"