Merge pull request #1401 from Lendico/better_task_naming

Better naming for recurrent tasks
This commit is contained in:
Spencer Smith 2017-07-06 09:01:07 -04:00 committed by GitHub
commit 44079b7176
4 changed files with 8 additions and 8 deletions

View file

@ -1,6 +1,6 @@
--- ---
- name: bootstrap/ca_trust | pull CA from cert from groups.vault|first - name: "bootstrap/ca_trust | pull CA from cert from {{groups.vault|first}}"
command: "cat {{ vault_cert_dir }}/ca.pem" command: "cat {{ vault_cert_dir }}/ca.pem"
register: vault_cert_file_cat register: vault_cert_file_cat
delegate_to: "{{ groups['vault']|first }}" delegate_to: "{{ groups['vault']|first }}"

View file

@ -26,7 +26,7 @@
mode: "{{ issue_cert_dir_mode | d('0755') }}" mode: "{{ issue_cert_dir_mode | d('0755') }}"
owner: "{{ issue_cert_file_owner | d('root') }}" owner: "{{ issue_cert_file_owner | d('root') }}"
- name: issue_cert | Generate the cert - name: "issue_cert | Generate the cert for {{ issue_cert_role }}"
uri: uri:
url: "{{ issue_cert_url }}/v1/{{ issue_cert_mount|d('pki') }}/issue/{{ issue_cert_role }}" url: "{{ issue_cert_url }}/v1/{{ issue_cert_mount|d('pki') }}/issue/{{ issue_cert_role }}"
headers: "{{ issue_cert_headers }}" headers: "{{ issue_cert_headers }}"
@ -40,7 +40,7 @@
register: issue_cert_result register: issue_cert_result
when: inventory_hostname == issue_cert_hosts|first when: inventory_hostname == issue_cert_hosts|first
- name: issue_cert | Copy the cert to all hosts - name: "issue_cert | Copy {{ issue_cert_path }} cert to all hosts"
copy: copy:
content: "{{ hostvars[issue_cert_hosts|first]['issue_cert_result']['json']['data']['certificate'] }}" content: "{{ hostvars[issue_cert_hosts|first]['issue_cert_result']['json']['data']['certificate'] }}"
dest: "{{ issue_cert_path }}" dest: "{{ issue_cert_path }}"
@ -48,7 +48,7 @@
mode: "{{ issue_cert_file_mode | d('0644') }}" mode: "{{ issue_cert_file_mode | d('0644') }}"
owner: "{{ issue_cert_file_owner | d('root') }}" owner: "{{ issue_cert_file_owner | d('root') }}"
- name: issue_cert | Copy the key to all hosts - name: "issue_cert | Copy key for {{ issue_cert_path }} to all hosts"
copy: copy:
content: "{{ hostvars[issue_cert_hosts|first]['issue_cert_result']['json']['data']['private_key'] }}" content: "{{ hostvars[issue_cert_hosts|first]['issue_cert_result']['json']['data']['private_key'] }}"
dest: "{{ issue_cert_path.rsplit('.', 1)|first }}-key.{{ issue_cert_path.rsplit('.', 1)|last }}" dest: "{{ issue_cert_path.rsplit('.', 1)|first }}-key.{{ issue_cert_path.rsplit('.', 1)|last }}"

View file

@ -28,7 +28,7 @@
state: directory state: directory
when: inventory_hostname not in sync_file_srcs when: inventory_hostname not in sync_file_srcs
- name: "sync_file | Copy the file to hosts that don't have it" - name: "sync_file | Copy {{ sync_file_path }} to hosts that don't have it"
copy: copy:
content: "{{ sync_file_contents }}" content: "{{ sync_file_contents }}"
dest: "{{ sync_file_path }}" dest: "{{ sync_file_path }}"
@ -37,7 +37,7 @@
owner: "{{ sync_file_owner|d('root') }}" owner: "{{ sync_file_owner|d('root') }}"
when: inventory_hostname not in sync_file_srcs when: inventory_hostname not in sync_file_srcs
- name: "sync_file | Copy the key file to hosts that don't have it" - name: "sync_file | Copy {{ sync_file_key_path }} to hosts that don't have it"
copy: copy:
content: "{{ sync_file_key_contents }}" content: "{{ sync_file_key_contents }}"
dest: "{{ sync_file_key_path }}" dest: "{{ sync_file_key_path }}"

View file

@ -19,12 +19,12 @@
when: >- when: >-
sync_file_is_cert|d() and (sync_file_key_path is not defined or sync_file_key_path == '') sync_file_is_cert|d() and (sync_file_key_path is not defined or sync_file_key_path == '')
- name: "sync_file | Check if file exists" - name: "sync_file | Check if {{sync_file_path}} file exists"
stat: stat:
path: "{{ sync_file_path }}" path: "{{ sync_file_path }}"
register: sync_file_stat register: sync_file_stat
- name: "sync_file | Check if key file exists" - name: "sync_file | Check if {{ sync_file_key_path }} key file exists"
stat: stat:
path: "{{ sync_file_key_path }}" path: "{{ sync_file_key_path }}"
register: sync_file_key_stat register: sync_file_key_stat