rework some loops

This commit is contained in:
Robert Kaussow 2018-08-18 17:43:50 +02:00
parent 7e7fad4d1f
commit 97c27264fa

View File

@ -11,14 +11,14 @@
- name: Copy certs and private key (file) - name: Copy certs and private key (file)
copy: copy:
src: "{{ item.0.source }}" src: "{{ item.src }}"
dest: "{{ item.0.path }}/{{ item.0.name }}" dest: "{{ item.dest }}"
mode: "{{ item.0.mode }}" mode: "{{ item.mode }}"
with_subelements: with_items:
- "{{ __pve_certificates }}" - { source: "{{ pve_tls_cert_source }}", dest: "/etc/pki/tls/certs", mode: "0750" }
- nodes - { source: "{{ pve_tls_key_source }}", dest: "/etc/pki/tls/private", mode: "0600" }
loop_control: loop_control:
label: "{{ item.0.path }}/{{ item.0.name }}" label: "{{ item.dest }}"
register: __pve_copy_cert_file register: __pve_copy_cert_file
when: pve_tls_source_use_files when: pve_tls_source_use_files
@ -28,14 +28,14 @@
- name: Copy certs and private key (content) - name: Copy certs and private key (content)
copy: copy:
content: "{{ item.0.source }}" content: "{{ item.src }}"
dest: "{{ item.0.path }}/{{ item.0.name }}" dest: "{{ item.dest }}"
mode: "{{ item.0.mode }}" mode: "{{ item.mode }}"
with_subelements: with_items:
- "{{ __pve_certificates }}" - { source: "{{ pve_tls_cert_source }}", dest: "/etc/pki/tls/certs", mode: "0750" }
- nodes - { source: "{{ pve_tls_key_source }}", dest: "/etc/pki/tls/private", mode: "0600" }
loop_control: loop_control:
label: "{{ item.0.path }}/{{ item.0.name }}" label: "{{ item.dest }}"
register: __pve_copy_cert_content register: __pve_copy_cert_content
when: pve_tls_source_use_content when: pve_tls_source_use_content
@ -44,12 +44,14 @@
when: pve_tls_source_use_content when: pve_tls_source_use_content
- name: Copy cert/key to pve filesystem - name: Copy cert/key to pve filesystem
command: "/bin/cp -rf {{ item.dest }} /etc/pve/nodes/{{ item.dest | basename }}" command: "/bin/cp -rf {{ item.dest }} /etc/pve/nodes/{{ item[1] }}/{{ item[0].dest | basename }}"
when: item.changed when: item[0].changed
changed_when: item.changed changed_when: item[0].changed
with_items: "{{ __pve_copy_cert.results }}" with_nested:
- "{{ __pve_copy_cert.results }}"
- "{{ pve_nodes }}"
loop_control: loop_control:
label: "/etc/pve/nodes/{{ item.dest | basename }}" label: "/etc/pve/nodes/{{ item[0].dest | basename }}"
notify: __pveproxy_restart notify: __pveproxy_restart
become: True become: True
become_user: root become_user: root