Skip to content
This repository has been archived by the owner on Jun 29, 2022. It is now read-only.

Commit

Permalink
Add default dictionaries to handle lost host. Handle ansible rc if cs…
Browse files Browse the repository at this point in the history
…v was successfully created. Closes #475.
  • Loading branch information
chambridge committed Nov 15, 2017
1 parent d45bc2f commit 97a3dcd
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
4 changes: 4 additions & 0 deletions library/spit_results.py
Expand Up @@ -874,6 +874,10 @@ def write_to_csv(self):

# Write the data
for data in self.vals:
# Add blanks for any missing facts
for fact in keys:
if fact not in data:
data[fact] = ''
writer.writerow(data)


Expand Down
10 changes: 8 additions & 2 deletions rho/inventory_scan.py
Expand Up @@ -97,7 +97,7 @@ def inventory_scan(hosts_yml_path, facts_to_collect, report_path,
:returns: True if scan completed successfully, False if not.
"""

success = False
hosts_yml = base_name + utilities.PROFILE_HOSTS_SUFIX
hosts_yml_path = utilities.get_config_path(hosts_yml)

Expand Down Expand Up @@ -138,4 +138,10 @@ def inventory_scan(hosts_yml_path, facts_to_collect, report_path,
log_to_stdout=utilities.tail_host_scan,
ansible_verbosity=verbosity)

return process.exitstatus == 0 and process.signalstatus is None
if process.exitstatus == 0 and process.signalstatus is None:
success = True
elif (process.exitstatus == 4 and process.signalstatus is None and
os.path.isfile(report_path)):
success = True

return success
2 changes: 1 addition & 1 deletion roles/write/tasks/main.yml
@@ -1,7 +1,7 @@
---

- name: store facts from all hosts in a variable
set_fact: host_fact={{hostvars[item]["connection"] | combine(hostvars[item]["uname"]) | combine(hostvars[item]["date"]) | combine(hostvars[item]["file_contents"]) | combine(hostvars[item]["dmi"]) | combine(hostvars[item]["subman"]) | combine(hostvars[item]["redhat_release"]) | combine(hostvars[item]["cpu"]) | combine(hostvars[item]["virt"]) | combine(hostvars[item]["virt_what"]) | combine(hostvars[item]["etc_release"]) | combine(hostvars[item]["redhat_packages"]) }}
set_fact: host_fact={{hostvars[item]["connection"]|default({}) | combine(hostvars[item]["uname"]|default({})) | combine(hostvars[item]["date"]|default({})) | combine(hostvars[item]["file_contents"]|default({})) | combine(hostvars[item]["dmi"]|default({})) | combine(hostvars[item]["subman"]|default({})) | combine(hostvars[item]["redhat_release"]|default({})) | combine(hostvars[item]["cpu"]|default({})) | combine(hostvars[item]["virt"]|default({})) | combine(hostvars[item]["virt_what"]|default({})) | combine(hostvars[item]["etc_release"]|default({})) | combine(hostvars[item]["redhat_packages"]|default({})) }}
with_items: "{{groups.alpha}}"
register: host_facts

Expand Down

0 comments on commit 97a3dcd

Please sign in to comment.