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

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
* master:
  Add jboss.eap.init-files to JBOSS_FACTS. Closes #478. (#479)
  Add default dictionaries to handle lost host. Handle ansible rc if csv was successfully created. Closes #475. (#476)
  Fix addition of certs for wrong when condition. Closes #472. (#474)
  Present more status during discovery for larger environments. Closes #442. (#467)
  revert default logging change. Closes #460. (#461)
  Check for empty vault password. Closes #444. (#457)
  Highlight potential issues in the console output. Closes #443. (#458)
  Default verbosity to 1 for improved log data. Closes #441. (#456)
  Turn off colors in the ansible log. Closes #448. (#455)
  Fix task that can hang if systemctl paginates
  Update playbook to use free strategy. Closes #445. (#453)
  Merge 0.30 version into master branch (#451)

# Conflicts:
#	rho/ansible_utils.py
#	rho/facts.py
#	rho/inventory_scan.py
#	rho/postprocessing.py
#	rho/scancommand.py
#	roles/jboss_eap/tasks/main.yml
#	roles/write/tasks/main.yml
#	test/test_postprocessing.py
  • Loading branch information
chambridge committed Nov 29, 2017
1 parent 5b51f4b commit 6595d65
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion roles/jboss_eap/tasks/main.yml
Expand Up @@ -104,7 +104,7 @@
ignore_errors: yes
when: '"jboss.eap.jboss-user" in facts_to_collect'
- name: look for jboss systemd service
raw: systemctl list-unit-files
raw: systemctl list-unit-files --no-pager
register: jboss_eap_systemctl_unit_files
ignore_errors: yes
become: true
Expand Down
7 changes: 6 additions & 1 deletion roles/redhat_packages/tasks/main.yml
Expand Up @@ -139,6 +139,11 @@
- 'redhat-packages.results'
when: gather_redhat_packages

- name: initialize redhat-packages.certs fact
set_fact:
redhat_packages_certs: ''
when: gather_certs

- name: gather redhat-packages.certs fact
raw: ls /etc/pki/product/ | grep '.pem'
register: redhat_packages_certs_cmd
Expand All @@ -155,4 +160,4 @@
redhat_packages: "{{ redhat_packages|default({}) | combine({ item: redhat_packages_certs }) }}"
with_items:
- 'redhat-packages.certs'
when: gather_redhat_packages
when: gather_certs

0 comments on commit 6595d65

Please sign in to comment.