mirror of https://github.com/ansible/ansible.git
You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
51a9875cfd
* Update docker inventory to use APIClient
docker-py has been updated, and the `Client` class no longer
exists. We use the new `APIClient` class.
To provide graceful failure when docker-py is not installed,
we need to create a dummy `Client` class so that the inventory
script will get as far as displaying a useful error message
Before
```
$ contrib/inventory/docker.py --pretty
Traceback (most recent call last):
File "contrib/inventory/docker.py", line 418, in <module>
class AnsibleDockerClient(Client):
NameError: name 'Client' is not defined
```
After
```
$ contrib/inventory/docker.py --pretty
Failed to import docker-py. Try `pip install docker-py` - cannot import name Client
```
* docker inventory configuration file location
Allow docker.yml to live next to docker.py, as well as in the
current directory
(cherry picked from commit
|
7 years ago | |
|---|---|---|
| .. | ||
| abiquo.ini | ||
| abiquo.py | 8 years ago | |
| apache-libcloud.py | 7 years ago | |
| apstra_aos.ini | ||
| apstra_aos.py | 7 years ago | |
| azure_rm.ini | ||
| azure_rm.py | 7 years ago | |
| brook.ini | ||
| brook.py | ||
| cloudforms.ini | ||
| cloudforms.py | ||
| cloudstack.ini | ||
| cloudstack.py | ||
| cobbler.ini | ||
| cobbler.py | 7 years ago | |
| collins.ini | ||
| collins.py | 8 years ago | |
| consul_io.ini | 7 years ago | |
| consul_io.py | 7 years ago | |
| digital_ocean.ini | ||
| digital_ocean.py | 7 years ago | |
| docker.py | 7 years ago | |
| docker.yml | ||
| ec2.ini | 7 years ago | |
| ec2.py | 7 years ago | |
| fleet.py | 8 years ago | |
| foreman.ini | 7 years ago | |
| foreman.py | 7 years ago | |
| freeipa.py | 7 years ago | |
| gce.ini | ||
| gce.py | 7 years ago | |
| jail.py | 8 years ago | |
| landscape.py | ||
| libcloud.ini | ||
| libvirt_lxc.py | 8 years ago | |
| linode.ini | ||
| linode.py | 7 years ago | |
| lxc_inventory.py | 8 years ago | |
| lxd.ini | ||
| lxd.py | ||
| mdt.ini | ||
| mdt_dynamic_inventory.py | 8 years ago | |
| nagios_livestatus.ini | 8 years ago | |
| nagios_livestatus.py | 8 years ago | |
| nagios_ndo.ini | ||
| nagios_ndo.py | 8 years ago | |
| nova.ini | ||
| nova.py | 8 years ago | |
| nsot.py | 8 years ago | |
| nsot.yaml | ||
| openshift.py | ||
| openstack.py | 7 years ago | |
| openstack.yml | ||
| openvz.py | 8 years ago | |
| ovirt.ini | ||
| ovirt.py | 8 years ago | |
| ovirt4.py | ||
| packet_net.ini | 7 years ago | |
| packet_net.py | 7 years ago | |
| proxmox.py | 8 years ago | |
| rackhd.py | 7 years ago | |
| rax.ini | ||
| rax.py | 7 years ago | |
| rhv.py | ||
| rudder.ini | ||
| rudder.py | ||
| serf.py | ||
| softlayer.py | 7 years ago | |
| spacewalk.ini | ||
| spacewalk.py | 8 years ago | |
| ssh_config.py | 8 years ago | |
| stacki.py | 8 years ago | |
| stacki.yml | ||
| vagrant.py | ||
| vbox.py | 8 years ago | |
| vmware.ini | ||
| vmware.py | 7 years ago | |
| vmware_inventory.ini | ||
| vmware_inventory.py | 7 years ago | |
| windows_azure.ini | ||
| windows_azure.py | 8 years ago | |
| zabbix.ini | ||
| zabbix.py | 7 years ago | |
| zone.py | 8 years ago | |