opendev/ansible-role-puppet
Code Issues Proposed changes

Add whitespace between tasks for better readability

Browse Source 
There are absolutely no substantive changes in this patch.

Change-Id: Ia1f3cf005f272b269093348507db4e38735e20d3
This commit is contained in:
Monty Taylor 2015-12-01 10:31:36 -06:00
parent f23f6d6d98
commit 5155e7c3a1
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tasks/main.yml
View File

@ -7,6 +7,7 @@
group: root group: root
mode: 0700 mode: 0700
when: copy_hieradata is defined and copy_hieradata when: copy_hieradata is defined and copy_hieradata
- name: ensure hiera datadir - fqdn - name: ensure hiera datadir - fqdn
file: file:
state: directory state: directory
@ -15,6 +16,7 @@
group: root group: root
mode: 0700 mode: 0700
when: copy_hieradata is defined and copy_hieradata when: copy_hieradata is defined and copy_hieradata
- name: ensure hiera datadir - group - name: ensure hiera datadir - group
file: file:
state: directory state: directory
@ -23,6 +25,7 @@
group: root group: root
mode: 0700 mode: 0700
when: copy_hieradata is defined and copy_hieradata when: copy_hieradata is defined and copy_hieradata
- name: make file list - name: make file list
puppet_get_hiera_file_list: puppet_get_hiera_file_list:
fqdn: "{{ ansible_fqdn }}" fqdn: "{{ ansible_fqdn }}"
@ -30,6 +33,7 @@
when: copy_hieradata is defined and copy_hieradata when: copy_hieradata is defined and copy_hieradata
delegate_to: localhost delegate_to: localhost
register: hiera_file_paths register: hiera_file_paths
- name: find which files exist - name: find which files exist
stat: stat:
path: "{{ hieradata }}/{{ hieraenvironment }}/{{ item }}" path: "{{ hieradata }}/{{ hieraenvironment }}/{{ item }}"
@ -37,6 +41,7 @@
with_items: hiera_file_paths.paths_dict.paths with_items: hiera_file_paths.paths_dict.paths
delegate_to: localhost delegate_to: localhost
when: copy_hieradata is defined and copy_hieradata when: copy_hieradata is defined and copy_hieradata
- name: copy hiera files - name: copy hiera files
when: copy_hieradata is defined and copy_hieradata and item.1.stat.exists when: copy_hieradata is defined and copy_hieradata and item.1.stat.exists
copy: copy:
@ -46,6 +51,7 @@
with_together: with_together:
- hiera_file_paths.paths_dict.paths - hiera_file_paths.paths_dict.paths
- st.results - st.results
- name: run puppet - name: run puppet
puppet: puppet:
puppetmaster: "{{ puppetmaster|default(omit) }}" puppetmaster: "{{ puppetmaster|default(omit) }}"
@ -53,19 +59,23 @@
show_diff: "{{ show_diff|default(false) }}" show_diff: "{{ show_diff|default(false) }}"
facts: "{{ facts|default(omit) }}" facts: "{{ facts|default(omit) }}"
facter_basename: "{{ facter_basename|default(omit) }}" facter_basename: "{{ facter_basename|default(omit) }}"
- name: find logs - name: find logs
shell: "ls -tr /var/lib/puppet/reports/{{ ansible_fqdn }}/*_puppetdb.json" shell: "ls -tr /var/lib/puppet/reports/{{ ansible_fqdn }}/*_puppetdb.json"
register: files register: files
when: puppetdb is defined when: puppetdb is defined
- name: set log filename - name: set log filename
set_fact: puppet_logfile="{{ files.stdout_lines|sort|last }}" set_fact: puppet_logfile="{{ files.stdout_lines|sort|last }}"
when: puppetdb is defined when: puppetdb is defined
- name: fetch file - name: fetch file
synchronize: synchronize:
mode: pull mode: pull
src: "{{ puppet_logfile }}" src: "{{ puppet_logfile }}"
dest: /var/lib/puppet/reports/{{ ansible_fqdn }} dest: /var/lib/puppet/reports/{{ ansible_fqdn }}
when: puppetdb is defined when: puppetdb is defined
- name: post facts - name: post facts
puppet_post_puppetdb: puppet_post_puppetdb:
puppetdb: "{{ puppetdb }}" puppetdb: "{{ puppetdb }}"