This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/lib/ansible/plugins/lookup/fileglob.py b/lib/ansible/plugins/lookup/fileglob.py | |
index 91442dda5e..e217793087 100644 | |
--- a/lib/ansible/plugins/lookup/fileglob.py | |
+++ b/lib/ansible/plugins/lookup/fileglob.py | |
@@ -58,7 +58,17 @@ class LookupModule(LookupBase): |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
. | |
├── files | |
│ └── file.txt | |
├── play.yml | |
└── roles | |
└── get_file | |
└── tasks | |
└── main.yml |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- hosts: proxy | |
become: true | |
any_errors_fatal: true | |
pre_tasks: | |
- include_vars: vars/bascule_sph | |
- name: Wait | |
include: roles/orange.ansible_helpers/tasks/disable.yml | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- hosts: all | |
environment: | |
a: b | |
c: d | |
roles: | |
- name: test | |
environment: | |
c: x | |
d: b | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[dev:children] | |
dev_webservers | |
dev_dbs | |
[dev_webservers] | |
devsrv1 | |
[dev_dbs] | |
devsrv1 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/awx/main/management/commands/inventory_import.py b/awx/main/management/commands/inventory_import.py | |
index c5cb9d518..df2be2bb0 100644 | |
--- a/awx/main/management/commands/inventory_import.py | |
+++ b/awx/main/management/commands/inventory_import.py | |
@@ -661,11 +661,13 @@ class Command(BaseCommand): | |
if group_name in existing_group_names: | |
continue | |
mem_group = self.all_group.all_groups[group_name] | |
+ import_vars = json.dumps(mem_group.variables) | |
+ group_desc = import_vars.pop('_awx_description', 'imported') |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- mytask: | |
vars: | |
local_var: '{{(local_var <= 20)|ternary(20, local_var)}}' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
groups: | |
telnet: telnet|bool |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/lib/ansible/config/manager.py b/lib/ansible/config/manager.py | |
index 1731906b31..9825d7351a 100644 | |
--- a/lib/ansible/config/manager.py | |
+++ b/lib/ansible/config/manager.py | |
@@ -137,7 +137,7 @@ def ensure_type(value, value_type, origin=None): | |
elif value_type == 'pathlist': | |
if isinstance(value, string_types): | |
- value = value.split(',') |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/lib/ansible/plugins/inventory/nmap.py b/lib/ansible/plugins/inventory/nmap.py | |
index d2c54fe84e..71fd149988 100644 | |
--- a/lib/ansible/plugins/inventory/nmap.py | |
+++ b/lib/ansible/plugins/inventory/nmap.py | |
@@ -113,6 +113,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable): | |
cmd.append(self._options['address']) | |
try: | |
# execute | |
+ display.debug("Running %s" % cmd) | |
p = Popen(cmd, stdout=PIPE, stderr=PIPE) |