cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
ansible/contrib/inventory
History
milo-minderbinder 77d73808e6 fix setting config with DOCKER_CONFIG_FILE (#23096) 
Fixes #23095

Fixed issue preventing a caller from setting a docker
configuration file (e.g. docker.yml) by specifing the
config file path in the `DOCKER_CONFIG_FILE` environment
variable. Previously, the cli argument parser set a default value for
the `--config-file` argument which would prevent ever checking the
environment variable, regardless of whether or not the `--config-file`
argument even specified a valid file.

This commit adds a global `DEFAULT_DOCKER_CONFIG_FILE` variable, which
points to the current default `docker.yml` config in the
contrib/inventory directory. Now, when this script is called from the
command line, the config file passed with the cli `--config-file` arg
will be given the highest precedence; if it is absent, this script will
then check if the `DOCKER_CONFIG_FILE` env var is set, and load the
config file specified if possible. If neither the environment variable
or cli argument are specified, then the script will attempt to parse the
config file `docker.yml` in this script's directory (if present).

If either the `DOCKER_CONFIG_FILE` environment variable or the
`--config-file` argument are given but point to a nonexistant file, then
the script will print an error message and exit with an error code.

It is *not* an error condition if the fallback `docker.yml` does not
exist.
2018-10-30 15:39:32 -04:00
..
abiquo.ini
abiquo.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
apache-libcloud.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
apstra_aos.ini
apstra_aos.py Surround top-level function and class definitions with two blank lines. 2018-07-31 12:06:56 -07:00
azure_rm.ini add group_by_os_family in azure dynamic inventory (#40702) 2018-08-09 17:00:17 +08:00
azure_rm.py Fix #43917 (#43929) 2018-08-13 12:24:13 +08:00
brook.ini
brook.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
cloudforms.ini
cloudforms.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
cloudstack.ini
cloudstack.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
cobbler.ini
cobbler.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
collins.ini
collins.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
consul_io.ini Misc typo fixes (#45969) 2018-09-21 14:43:22 +01:00
consul_io.py Add environmental variables to allow for the script to be run without consul_io.ini. This allows it to run dynamically without any prerequisite config file (#30900) 2018-09-19 18:19:35 -04:00
digital_ocean.ini
digital_ocean.py fix digitalocean inventory tags endpoint (#46192) 2018-10-06 22:20:11 -04:00
docker.py fix setting config with DOCKER_CONFIG_FILE (#23096) 2018-10-30 15:39:32 -04:00
docker.yml
ec2.ini Prefer readthedocs.io instead of readthedocs.org for doc links (#41537) 2018-06-18 08:22:50 -04:00
ec2.py ec2 inventory: python 3.7 compatibility (#43716) 2018-09-05 09:27:35 +10:00
fleet.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
foreman.ini
foreman.py Handle non-ascii characters in foreman.py (#46779) 2018-10-15 21:40:51 -04:00
freeipa.py
gce.ini Adding multiple project support for GCE (#39473) 2018-05-11 11:38:13 -04:00
gce.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
infoblox.py
infoblox.yaml
jail.py
landscape.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
libcloud.ini
libvirt_lxc.py
linode.ini
linode.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
lxc_inventory.py Surround top-level function and class definitions with two blank lines. 2018-07-31 12:06:56 -07:00
lxd.ini
lxd.py Fix shebangs and file modes and update tests. (#40563) 2018-05-22 14:25:36 -07:00
mdt.ini
mdt_dynamic_inventory.py Surround top-level function and class definitions with two blank lines. 2018-07-31 12:06:56 -07:00
nagios_livestatus.ini
nagios_livestatus.py Surround top-level function and class definitions with two blank lines. 2018-07-31 12:06:56 -07:00
nagios_ndo.ini
nagios_ndo.py Surround top-level function and class definitions with two blank lines. 2018-07-31 12:06:56 -07:00
nsot.py Surround top-level function and class definitions with two blank lines. 2018-07-31 12:06:56 -07:00
nsot.yaml
openshift.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
openstack.yml The keyword 'cloud' has been deprecated in favor of the 'profile' keyword by os-client-config. (#31389) 2018-09-20 11:31:19 -05:00
openstack_inventory.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
openvz.py
ovirt.ini ovirt: Clarify secrets configuration (#39501) 2018-05-01 14:10:58 -05:00
ovirt.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
ovirt4.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
packet_net.ini
packet_net.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
proxmox.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
rackhd.py
rax.ini
rax.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
rhv.py
rudder.ini
rudder.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
scaleway.ini
scaleway.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
serf.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
softlayer.py Fix bugs in softlayer dynamic inventory (#28178) 2018-09-19 18:10:15 -04:00
spacewalk.ini
spacewalk.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
ssh_config.py Python 3.8 collections compatibility fixes. 2018-10-08 11:26:37 -07:00
stacki.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
stacki.yml
vagrant.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
vbox.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
vmware.ini
vmware.py Python 3.8 collections compatibility fixes. 2018-10-08 11:26:37 -07:00
vmware_inventory.ini VMware: blacklist custom fields in vmware_inventory.py (#36877) 2018-07-18 21:39:16 +05:30
vmware_inventory.py VMware: remove unused imports (#43804) 2018-08-09 10:34:55 +05:30
zabbix.ini Zabbix inventory improvement (#42669) 2018-07-14 09:10:16 -04:00
zabbix.py Remove use of simplejson throughout code base (#43548) 2018-08-10 11:13:29 -05:00
zone.py