wallenstein/algo
1
0
Fork 0
mirror of https://github.com/trailofbits/algo.git synced 2025-07-14 09:42:54 +02:00
Code Issues Projects Releases Wiki Activity

Better variable gathering, fixed empty DNS IP

Browse source
This commit is contained in:
Ivan Gromov 2020-05-19 01:08:17 +05:00
parent dd2a05a96c
commit 8156687c20
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/playbook.py
View file

@ -3,6 +3,7 @@
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
import os
@ -19,7 +20,6 @@ from ansible.utils.display import Display
from ansible.utils.collection_loader import set_collection_playbook_paths
from ansible.plugins.loader import add_all_plugin_dirs
display = Display()
@ -187,12 +187,14 @@ class PlaybookCLI(CLI):
display.display(taskmsg)
host = inventory.groups['vpn-host'].hosts[0].name
fact_cache = pbex._variable_manager._nonpersistent_fact_cache[host]
host_vars = variable_manager.get_vars()['hostvars'][host]
return {
'CA_password': fact_cache['CA_password'],
'p12_export_password': fact_cache['p12_export_password'],
'algo_server_name': variable_manager.extra_vars['server_name'],
'ipv6_support': fact_cache['ipv6_support'],
'local_service_ip': variable_manager.get_vars()['hostvars'][host]['ansible_lo']['ipv4_secondaries'][0]['address'],
'CA_password': host_vars.get('CA_password'),
'p12_export_password': host_vars.get('p12_export_password'),
'algo_server_name': host_vars.get('server_name'),
'ipv6_support': host_vars.get('ipv6_support'),
'local_service_ip': host_vars.get('ansible_lo') and
host_vars.get('ansible_lo').get('ipv4_secondaries') and
host_vars.get('ansible_lo').get('ipv4_secondaries')[0]['address'],
'ansible_ssh_host': host,
}