cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
7152 commits 47 branches 390 tags 440 MiB
Commit graph

7152 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Coca
eb30416d71 Merge pull request #2114 from matiasdecarli/devel 
Update Azure Module to work with azure.py=1.0.1
 2015-10-14 15:46:26 -04:00
Brian Coca
4c14e6267f Merge pull request #2258 from SamYaple/fix_docker_bug_2257 
Don't assume ExposedPorts exists (bug #2257)
 2015-10-14 11:31:06 -04:00
Chris Church
84b1a1a2b7 Merge pull request #2083 from cchurch/win_lineinfile_fixes 
Fix win_lineinfile to pass integration tests
 2015-10-14 10:19:10 -04:00
Toshio Kuratomi
4c722dd99a Merge pull request #2268 from AdamWill/pull-18-stream 
fix #2043: strip empty dict from end of 'pull' stream
 2015-10-14 07:15:14 -07:00
Adam Williamson
64b8596250 fix #2043: strip empty dict from end of 'pull' stream 
When pulling an image using Docker 1.8, it seems the output
JSON stream has an empty dict at the very end. This causes
ansible to fail when pulling an image, as it's expecting a
status message in that dict which it uses to determine whether
it had to download the image or not. As a bit of an ugly hack
for that which remains backward compatible, try the last item
in the stream, and if it's an empty dict, take the last-but-one
item instead.

The strip() is needed as the exact value appears to be '{}/r/n';
we could just match that, but it seems like the kind of thing
where maybe it'd happen to just be '{}/n' or '{}' or something
in some cases, so let's just use strip() in case.
 2015-10-13 22:33:46 -07:00
Brian Coca
95b10c9fdd Merge pull request #2256 from jhawkesworth/fix_amc_2147 
Fix for ansible-modules-core 2147
 2015-10-13 20:17:28 -04:00
Sam Yaple
f15d285514 Catch the second occurance of ExposedPorts as well 2015-10-13 10:34:08 +00:00
Sam Yaple
9db5ac8e45 Don't assume ExposedPorts exists (bug #2257) 
A recent change [1] in docker between v1.8.2 and v1.8.3 changed what
is returned in the json when inspecting an image. Five variables which
could have been expected before will now be omited when empty. Only
one of those variables is being addressed in the docker, ExposedPorts.

Unfortunately there was also no API version change on this so this
can't be easily corrected with pinning the API to the older version.

This does a get() which will return None if the variable is not in the
dict formed from the json that was returned. Everything else works the
same way.

[1] 9098628b29
 2015-10-13 10:24:36 +00:00
=
833bf77be1 Fix for ansible modules core 2147 2015-10-13 06:15:25 +01:00
Brian Coca
657363e011 Merge pull request #2252 from perzizzle/windows_ansible_date_time 
Add ansible_date_time to windows facts
 2015-10-12 18:48:59 -04:00
Brian Coca
6f9ff0b914 Merge pull request #2248 from Constantin07/devel 
ec2_vol: added deleteOnTermination in the output of list option
 2015-10-12 18:47:31 -04:00
Brian Coca
da1a317f7d Merge pull request #2139 from justnom/devel 
Adding additional Docker log drivers.
 2015-10-12 18:45:55 -04:00
Brian Coca
84d42b2b31 Merge pull request #2212 from awiddersheim/fix/detached_head_detection 
Fix detached head detection in is_not_a_branch()
 2015-10-12 18:42:57 -04:00
Brian Coca
f1fc76d732 Merge pull request #2214 from fperks/fix-ec2-error-on-instance-status-change 
Fix error on ec2 status change
 2015-10-12 18:38:10 -04:00
Brian Coca
547cafe278 Merge pull request #2198 from hutchic/patch-2 
make a text link into a actual hyperlink
 2015-10-12 18:29:45 -04:00
Michael Perzel
6615e618d9 Added date, year and month attributes 2015-10-12 16:16:10 -05:00
Michael Perzel
785ebe2684 Add ansible_date_time to windows facts 2015-10-12 16:02:36 -05:00
Constantin Bugneac
83291dbefc Added deleteOnTermination in the output of list option 2015-10-12 10:49:16 +01:00
James Cammarata
92d25017ed Merge pull request #2243 from amenonsen/ec2-init 
Fix v2 breakage: Add missing variable initializations
 2015-10-10 22:13:20 -04:00
Abhijit Menon-Sen
ebd8b12e15 Add missing variable initializations 
Without this, «ec2: state=stopped instance_ids=…» would fail with a
traceback like this:

    if inst.get_attribute('sourceDestCheck')['sourceDestCheck'] != source_dest_check:
NameError: global name 'source_dest_check' is not defined
 2015-10-11 07:25:56 +05:30
Brian Coca
f707a711cd doc fixes 2015-10-09 18:36:58 -04:00
Brian Coca
0307e3e649 Merge pull request #2209 from gekmihesg/devel 
Support sysctl on OpenBSD
 2015-10-09 13:26:24 -04:00
Brian Coca
17602d6525 Merge pull request #2234 from fvant/patch-8 
Fix ec2_asg.py to handle ELB without instances
 2015-10-09 11:41:07 -04:00
Frank van Tol
2c24d0482b Update ec2_asg.py 2015-10-09 14:35:26 +02:00
Brian Coca
79e253053a Merge pull request #2229 from axilleas/cron_add_missing_doc 
[cron] Add missing documentation: cron_file requires user to be set
 2015-10-08 22:41:36 -04:00
Toshio Kuratomi
01dcee98d2 Fix for state=latest with wildcard or virtual provide package names 2015-10-08 09:56:43 -07:00
Achilleas Pipinellis
1499288c64 Add missing documentation: cron_file requires user to be set 2015-10-08 19:20:08 +03:00
Brian Coca
5f1f1b2904 Merge pull request #2216 from wimnat/feature/revert-1906 
Set default of dimensions parameter to be empty dict
 2015-10-08 11:03:21 -04:00
Rob
5a6599d70d Move import statements for easier debugging (correct line numbers) 2015-10-08 14:03:40 +11:00
Brian Coca
9eb0c178ec Merge pull request #725 from robbwagoner/cloudformation-resources 
module cloudformation: include a CFN stack's resources in the result
 2015-10-07 21:35:39 -04:00
Brian Coca
85570152a7 Merge pull request #1626 from kmadac/fixed-digital-ocean-domain-MX-Origin-Error 
Fixed bug, when MX records pointed to ORIGIN(@) caused unintentional …
 2015-10-07 21:35:06 -04:00
Brian Coca
692781c936 Merge pull request #2070 from fvant/patch-7 
We are copying from S3,  the bucket is the source, not the target.
 2015-10-07 21:34:48 -04:00
Brian Coca
969c4eb493 Merge pull request #2078 from abithap/devel 
os_server: Adding support to accept 'n' nic args as a string containi…
 2015-10-07 21:34:33 -04:00
Brian Coca
7af7ef2ef7 Merge pull request #2086 from wimnat/feature/issue-2085 
Remove 'str' type so that json is properly quoted
 2015-10-07 21:34:00 -04:00
Brian Coca
af82f4b23e Merge pull request #2105 from dagnello/network_list_state 
Adding os_networks_facts module
 2015-10-07 21:33:28 -04:00
Brian Coca
00a18c2a6e Merge pull request #2110 from dagnello/os_image_facts 
Adding new image facts module
 2015-10-07 21:32:48 -04:00
Brian Coca
cb203420ed added version added to new rax_cdb choices 2015-10-07 21:30:17 -04:00
Brian Coca
202236f47f Merge pull request #1689 from mehulved/devel 
Added support for instance types.
 2015-10-07 21:27:06 -04:00
Brian Coca
547690c785 Merge pull request #2169 from stelligent/devel 
Replaces 'old' get_ec2_creds connection method with get_aws_connection_info
 2015-10-07 21:26:14 -04:00
Brian Coca
c4f64d822c changed modules to use common ec2 docs for region 2015-10-07 16:16:24 -04:00
fperks
7fd3262c3c Fix error on ec2 status change 
Both `source_dest_check` and `termination_protection` variables are not
available within the scope of the startstopec2 instance method. This just
pulls them from module.params.
 2015-10-07 13:43:57 -04:00
Brian Coca
661a0cb9ee Merge pull request #2223 from bcoca/pip_chdir_fixes 
make chdir a path so it resolves shell aliases
 2015-10-07 12:19:29 -04:00
Brian Coca
22bfb54d9d added comment explaining chdir defaults 2015-10-07 12:19:50 -04:00
Brian Coca
a639da7c44 default chdir to tmpdir to avoid virtualenv issues 2015-10-07 12:18:36 -04:00
Brian Coca
8c353d0516 make chdir a path so it resolves shell aliases 
also removed this_dir logic as it is not needed, chdir is None by default and run_command can handle that.
 2015-10-07 10:38:47 -04:00
Rob
ca517abf07 Set default of dimensions parameter to be empty dict 2015-10-07 13:54:00 +11:00
Andrew Widdersheim
e36e1339e8 Fix detached head detection in is_not_a_branch() 
Detached head detection seems to have broken somewhere a long the way
because git decided to change how that situation looks when doing a 'git
branch -a' which is performed by get_branches().

This is how git 1.7.1 displays this situation (which works):

shell> git branch -a
* (no branch)
  master

This is the output from git 1.8.3.1 (which does not work):

shell> git branch -a
* (detached from e132711)
  master

It looks like this same wording is used in the most recent version of
git (2.6.1 as of writing this).
 2015-10-06 15:37:45 -04:00
gekmihesg
cdf0c8a560 Support sysctl on OpenBSD 
Fixes #1233
 2015-10-06 17:38:47 +02:00
Brian Coca
3a9d046f96 Merge pull request #2206 from fxfitz/win_get_url_ps1_spelling 
Fixed spelling mistake: missing
 2015-10-06 08:29:12 -04:00
Brian Coca
1479e143b6 Merge pull request #2207 from adrianlzt/fix/doc_os_subnet 
Fix yaml syntax
 2015-10-06 08:28:55 -04:00