| |
@@ -66,12 +66,10 @@
|
| |
hosts = []
|
| |
variables = {}
|
| |
for subject in subjects:
|
| |
- if subject.startswith("docker:"):
|
| |
- image = subject[7:]
|
| |
- name, host_vars = inv_host(image, docker_extra_args)
|
| |
- if host_vars:
|
| |
- hosts.append(name)
|
| |
- variables[name] = host_vars
|
| |
+ name, host_vars = inv_host(subject, docker_extra_args)
|
| |
+ if host_vars:
|
| |
+ hosts.append(name)
|
| |
+ variables[name] = host_vars
|
| |
if not hosts:
|
| |
return EMPTY_INVENTORY
|
| |
return {"localhost": {"hosts": hosts, "vars": {}},
|
| |
@@ -79,7 +77,11 @@
|
| |
"_meta": {"hostvars": variables}}
|
| |
|
| |
|
| |
- def inv_host(image, docker_extra_args):
|
| |
+ def inv_host(subject, docker_extra_args):
|
| |
+ if not subject.startswith("docker:"):
|
| |
+ return None, EMPTY_INVENTORY
|
| |
+
|
| |
+ image = subject[7:]
|
| |
null = open(os.devnull, 'w')
|
| |
|
| |
try:
|
| |
bgoncalv
commented 5 years ago
Fix messages like:
Launching virtual machine for a33bc36b3d2133714cffba130a08db0433f71249029fe148cbe0056230f32d46
# ANSIBLE_INVENTORY=$(test -e inventory && echo inventory || echo /usr/share/ansible/inventory) TEST_SUBJECTS=docker:docker.io/fedora:rawhide ansible-inventory --list Launching Docker container for docker.io/fedora:rawhide Redirecting to /bin/systemctl start docker.service a33bc36b3d2133714cffba130a08db0433f71249029fe148cbe0056230f32d46 [ERROR]: Launching virtual machine for a33bc36b3d2133714cffba130a08db0433f71249029fe148cbe0056230f32d46 standard-inventory-qcow2: qemu failed to launch qcow2 image: a33bc36b3d2133714cffba130a08db0433f71249029fe148cbe0056230f32d46 { "_meta": { "hostvars": { "a33bc36b3d2133714cffba130a08db0433f71249029fe148cbe0056230f32d46": { "ansible_connection": "docker", "ansible_python_interpreter": "/usr/bin/python3" } } }, "all": { "children": [ "localhost", "subjects", "ungrouped" ] }, "localhost": { "hosts": [ "a33bc36b3d2133714cffba130a08db0433f71249029fe148cbe0056230f32d46" ] }, "subjects": { "hosts": [ "a33bc36b3d2133714cffba130a08db0433f71249029fe148cbe0056230f32d46" ] }, "ungrouped": {} }# ANSIBLE_INVENTORY=$(test -e inventory && echo inventory || echo /usr/share/ansible/inventory) TEST_SUBJECTS=local ansible-inventory --list [ERROR]: Launching virtual machine for local standard-inventory-qcow2: qemu failed to launch qcow2 image: local { "_meta": { "hostvars": { "local": { "ansible_connection": "local" } } }, "all": { "children": [ "localhost", "subjects", "ungrouped" ] }, "localhost": { "hosts": [ "local" ] }, "subjects": { "hosts": [ "local" ] }, "ungrouped": {} }