Dag Wieers
85a28179b7
Improve the wording a bit
...
According to what @amenonsen suggested in #10064 .
Although the additional statement is still needed to get rid of the ambiguity.
2016-03-03 14:38:40 +01:00
Dag Wieers
18d58e42d5
Improve ambiguous statement regarding handler order
...
This fixes #10064
2016-03-03 14:32:56 +01:00
Brian Coca
171c925966
Merge pull request #14756 from chouseknecht/docker_network_proposal
...
Updating docker_network module proposal.
2016-03-02 17:53:52 -05:00
Matt Davis
0ab29f573a
Merge pull request #14755 from bcoca/pause_nohup_fix
...
avoid issues when stdin is a closed file
2016-03-02 22:33:58 +00:00
Matt Martz
6ff0b079b4
Support SSL validation with redirect control for python versions without ssl context
2016-03-02 16:30:16 -06:00
Brian Coca
c24249c57d
made max diff size configurable
2016-03-02 17:25:22 -05:00
Joe
21ba6e9ce8
Do not use name tag
for intance filter
2016-03-02 20:06:14 +01:00
Brian Coca
e438a26ada
Merge pull request #14760 from yyoshiki41/docs-tag
...
Fixed docs typo
2016-03-02 13:50:34 -05:00
Joe
5975296770
Fix AWS EC2 external inventory script config read
...
EC2 inventory scripts reads configuration from an INI file. The `instance_filters` option controls which EC2 instances are retrieved for inventory. Filling this option and running the inventory script with Python 3 crashes with the following error:
```python
Traceback (most recent call last):
File "./contrib/inventory/ec2.py", line 1328, in <module>
Ec2Inventory()
File "./contrib/inventory/ec2.py", line 163, in __init__
self.read_settings()
File "./contrib/inventory/ec2.py", line 393, in read_settings
for instance_filter in config.get('ec2', 'instance_filters', '').split(','):
TypeError: get() takes 3 positional arguments but 4 were given
```
The problem is the last parameter of config.get() call, because `fallback` keyword argument is not specified.
The fix handles epmpty `instance_filers` in case of Python 2&3
2016-03-02 19:44:25 +01:00
yyoshiki41
64f445f3a1
Fixed docs typo
2016-03-03 03:19:46 +09:00
Matt Martz
49b0918574
Merge pull request #14758 from chouseknecht/docker_volume_proposal
...
Fix docker_volume module proposal file name.
2016-03-02 12:09:33 -06:00
chouseknecht
485bd4acc3
Fix docker_volume module proposal file name.
2016-03-02 13:00:04 -05:00
Toshio Kuratomi
1dbbd2a80c
Remove debugging and fix the place where bytes are being handed to StringIO
2016-03-02 09:31:06 -08:00
Brian Coca
ca0797fc4e
avoid issues when stdin is a closed file
...
this seems to happen when nohup is involved, so the check tty
does not get a chance to fail, it just works with pipes
fixes http://github.com/ansible/ansible-modules-core/issues/3166
2016-03-02 11:58:16 -05:00
Toshio Kuratomi
093b3422ec
more information
2016-03-02 08:58:15 -08:00
Brian Coca
7ba790bbaf
don't tempalte register
2016-03-02 11:57:43 -05:00
chouseknecht
d85589121e
Updating docker_network module proposal.
2016-03-02 11:40:59 -05:00
Toshio Kuratomi
5aef65edcd
Testing whether this fixes jenkins
2016-03-02 07:47:32 -08:00
Brian Coca
2cd52604e2
Merge pull request #14745 from jinesh-choksi/patch-1
...
On RHEL/CentOS 6 needed additional dependencies to build RPM
2016-03-02 10:44:23 -05:00
Brian Coca
ab182b2bdb
Merge pull request #14726 from chouseknecht/docker_one
...
Updating docker_container_module proposal
2016-03-02 10:29:06 -05:00
Brian Coca
ea71352bea
Merge pull request #14731 from chouseknecht/docker_image_facts_proposal
...
Updated docker_image_facts module proposal.
2016-03-02 10:27:52 -05:00
Brian Coca
15c938f2a2
Merge pull request #14740 from chouseknecht/docker_volume_facts_proposal
...
Adding docker_volume_facts module proposal
2016-03-02 10:21:46 -05:00
Brian Coca
4b5bb5dd89
Merge pull request #14739 from chouseknecht/docker_network_facts_proposal
...
Adding docker_network_facts module proposal.
2016-03-02 10:20:40 -05:00
Brian Coca
2a1f955ea5
Merge pull request #14737 from chouseknecht/docker_network_proposal
...
Adding docker_network module proposal.
2016-03-02 10:08:52 -05:00
Brian Coca
cc6adf44b6
Merge pull request #14738 from chouseknecht/docker_volume_proposal
...
Adding docker_volume module proposal
2016-03-02 10:06:49 -05:00
Brian Coca
7779e37283
Merge pull request #14743 from resmo/patch-3
...
Proposal: deprecate always_run in favor of checkmode_run
2016-03-02 10:02:06 -05:00
James Cammarata
3247390123
Conditionally import StringIO in template so we only use io.StringIO on py3
2016-03-02 09:34:43 -05:00
Brian Coca
7404d4ce7f
made dict example less ambigous
...
fixes #14748
2016-03-02 09:20:46 -05:00
James Cammarata
2c7a33f71d
Fixing bug in setup related to StringIO fixes
2016-03-02 08:05:43 -05:00
René Moser
26005dfa5b
proposal: deprecate always_run in favor of checkmode_run
2016-03-02 13:35:29 +01:00
Jinesh Choksi
78f6b61990
On RHEL/CentOS 6 needed additional dependencies to build RPM
...
To build an RPM on RHEL 6, we needed asciidoc, git and python-setuptools in addition to the rpm-build/make and python2-devel packages.
2016-03-02 10:54:37 +00:00
chouseknecht
e0f41c7726
Updated docker_image_facts module proposal.
2016-03-02 02:49:19 -05:00
chouseknecht
f10807eb42
Adding docker_network_facts module proposal.
2016-03-02 02:32:20 -05:00
chouseknecht
d0137abf98
Adding docker_volume_facts module proposal
2016-03-02 02:26:45 -05:00
chouseknecht
76766aac8b
Adding docker_network module proposal.
2016-03-02 00:10:36 -05:00
chouseknecht
804c6f9c09
Adding docker_volume module proposal
2016-03-02 00:00:31 -05:00
chouseknecht
b2dd22e9f2
Updating docker_container_module proposal
2016-03-01 23:14:30 -05:00
James Cammarata
9acb5aa176
Changing location of reduce import to not use six.moves
2016-03-01 17:06:46 -05:00
James Cammarata
b559d0e6ee
Adding py3 stub for reduce from six.moves
2016-03-01 16:55:01 -05:00
James Cammarata
b853e932d1
Adding unit tests for symbolic mode conversion stuff in basic.py
2016-03-01 16:41:57 -05:00
Brian Coca
71402abf21
only do squash when 'squashable field' present
2016-03-01 15:11:34 -05:00
James Cammarata
18240d350c
Adding a skip for the literal_eval test on py3
2016-03-01 14:33:05 -05:00
James Cammarata
0ea3a9d08d
Removing tabs from test_basic.py
2016-03-01 14:15:15 -05:00
James Cammarata
1de9357c2f
Attempt at cleaning up issues introduced by new basic.py unit tests
2016-03-01 14:06:58 -05:00
James Cammarata
e011f52557
Expanding unit tests for module_utils/basic.py
2016-03-01 13:53:13 -05:00
Brian Coca
70e7be0346
added clarification on moustaches
2016-03-01 12:43:52 -05:00
Brian Coca
c1785f56d5
added 2 new modules to changelog
2016-03-01 12:43:31 -05:00
Brian Coca
d6716a2f90
noted issues with setup now inheriting environment
2016-03-01 09:17:16 -05:00
Brian Coca
db2b5be9aa
Merge pull request #14718 from resmo/patch-3
...
doc: yumrepo renamed to yum_repository
2016-03-01 08:38:35 -05:00
Brian Coca
7af5787030
Merge pull request #14717 from xiaket/devel
...
Fix __repr__ for meta tasks
2016-03-01 08:37:09 -05:00