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

4182 commits

Author SHA1 Message Date
Brian Coca
3e2e81d896 missing path in import path for making paths 2015-06-02 23:42:00 -04:00
Brian Coca
65b82f69e4 avoid failing when mode is none 2015-06-02 23:39:57 -04:00
Brian Coca
5622fc23bc fixed frozen set, missing iterable 2015-06-02 23:35:15 -04:00
Brian Coca
48c0d6388f moved RAW var to class and as a frozenset 2015-06-02 23:35:15 -04:00
Matt Martz
1b48111b12 If remote_addr isn't set, set to ipv4_address 2015-06-02 14:56:32 -05:00
James Cammarata
f57eaece88 Merge pull request #11134 from sivel/import-display-cli-base 
Add missing import in ansible.cli
 2015-06-02 14:11:32 -05:00
Matt Martz
6519118106 Add missing import in ansible.cli 2015-06-02 14:11:16 -05:00
James Cammarata
7a617e7b93 Merge pull request #11131 from sivel/issue/11130 
Don't override ansible_ssh_host with inventory_hostname
 2015-06-02 14:03:25 -05:00
James Cammarata
c4ae51089d Merge pull request #11129 from sivel/fix-scp-if-ssh 
Fix command building for scp if ssh
 2015-06-02 14:02:51 -05:00
Matt Martz
697a1a4061 Don't override ansible_ssh_host with inventory_hostname 2015-06-02 14:01:11 -05:00
Matt Martz
71014ab01e Fix command building for scp if ssh 2015-06-02 13:35:53 -05:00
Brian Coca
093b5b6051 Merge pull request #11127 from bcoca/makedirs_safe 
created makedirs_safe function for use in cases of multiprocess
 2015-06-02 13:36:39 -04:00
Brian Coca
e0ef217f97 Revert "Adding raw module to list of modules allowing raw params" 
This reverts commit bc041ffea0.
same fix x2 does not fix it 'more'
 2015-06-02 13:33:33 -04:00
Brian Coca
ba02e5e3bf minor adjustments as per code review 2015-06-02 13:01:59 -04:00
Brian Coca
2590df6df1 created makedirs_safe function for use in cases of multiprocess 
should fix #11126 and most race conditions
 2015-06-02 11:41:30 -04:00
Brian Coca
47be5b4166 added missing ansibleoptionserror import and moved args check in playbook to after parser exists to allow for creating usage info 2015-06-02 11:03:17 -04:00
James Cammarata
d1b4371287 Correctly evaluate changed/failed for tasks using loops 2015-06-02 09:42:08 -05:00
Brian Coca
860a96cf70 Merge pull request #11097 from resmo/for-ansible 
cloudstack: updates and v1 sync
 2015-06-02 10:25:45 -04:00
James Cammarata
bc041ffea0 Adding raw module to list of modules allowing raw params 
Fixes #11119
 2015-06-02 08:42:24 -05:00
Brian Coca
e251e70178 added raw to 'raw' modules 2015-06-02 08:54:37 -04:00
Rene Moser
caf3cf6930 cloudstack: add timeout to utils 2015-06-02 14:51:25 +02:00
Rene Moser
fc807e29c8 cloudstack: add api_timeout to doc fragments 2015-06-02 14:51:25 +02:00
Rene Moser
7bb9cd3766 cloudstack: minor cleanup in doc fragments 2015-06-02 14:51:25 +02:00
James Cammarata
620fad9f8d Fixing an oops in inventory/__init__.py where the slots are incorrect 2015-06-01 20:02:15 -05:00
James Cammarata
7f1b64d934 Submodule pointer update for core to the merged v2 branch 2015-06-01 19:46:29 -05:00
James Cammarata
e547e1f9ba Merge branch 'devel' into devel_switch_v2 2015-06-01 16:53:15 -05:00
James Cammarata
fe41f109a9 Merge branch 'v2_final' into devel_switch_v2 2015-06-01 16:42:59 -05:00
James Cammarata
4bc7703db3 Fixing some small bugs related to integration tests (v2) 2015-06-01 16:42:10 -05:00
Jon Hawkesworth
30b92a6f4c Get-FileChecksum allways returns a string now, 
and the test_win_copy integration tests that depend on the checksum
have been updated in this change too.
 2015-06-01 21:53:49 +01:00
Brian Coca
9a90ca5a36 Merge pull request #11062 from Etienne-Carriere/factor_f5 
Factor primitives for F5 modules
 2015-06-01 10:34:11 -04:00
sysadmin75
816b20af0b Fixes #11046 2015-06-01 10:24:20 -04:00
sysadmin75
908d6c0ef2 Fixes #11046 2015-05-31 20:05:02 -04:00
Toshio Kuratomi
5954892457 Update submodule refs 2015-05-29 19:00:16 -07:00
Brian Coca
529726d0ba fixed mistaken module update in prev commit 2015-05-29 16:22:55 -04:00
Brian Coca
7e020d21de correctly identify ubuntu now in all cases 
made NA the last resort
 2015-05-29 16:19:09 -04:00
Brian Coca
a8c290cc3b fixed ubuntu facts for all versions 
made sure NA is option of last resort
 2015-05-29 16:14:30 -04:00
Monty Taylor
2046d76310 Add defaults and a link to os-client-config docs 2015-05-29 13:10:13 -07:00
Monty Taylor
b659621575 Remove unneeded required_one_of for openstack 
We're being too strict - there is a third possibility, which is that a
user will have defined the OS_* environment variables and expect them to
pass through.
 2015-05-29 13:09:45 -07:00
Toshio Kuratomi
2924c90a5d Merge pull request #10977 from emonty/fix-envvars 
Fix envvars support in openstack modules
 2015-05-29 13:05:03 -07:00
Toshio Kuratomi
dee2d53b3e Update v2 submodule refs 2015-05-29 08:51:50 -07:00
Jon Hawkesworth
12691ce109 Add -Compress to ConvertTo-Json calls in common powershell code 2015-05-29 10:40:24 -04:00
Jon Hawkesworth
9371c38af9 Add -Compress to ConvertTo-Json calls in common powershell code 2015-05-29 14:50:08 +01:00
James Cammarata
7985d2a8be Moving included file stuff to a proper dedicated class and file (v2) 2015-05-28 23:58:38 -05:00
James Cammarata
fe014148d9 Removing errant debug print 2015-05-28 20:29:16 -05:00
Brian Coca
e7a096c4c5 cowsay is back! 2015-05-28 20:01:39 -04:00
Stefan Midjich
e5190327f2 this fixes ansible on openbsd and freebsd systems. only tested on openbsd. 2015-05-28 19:17:31 -04:00
Toshio Kuratomi
5d213cab23 Update extras submodule ref for doc fix 2015-05-28 16:00:58 -07:00
Toshio Kuratomi
5ffc1183dd WHoops, that was the core module stable branch 2015-05-28 15:37:12 -07:00
Toshio Kuratomi
2f4ad2714f Update core module ref 2015-05-28 15:36:35 -07:00
Toshio Kuratomi
4d8427538d Update submodule refs 2015-05-28 15:10:06 -07:00
James Cammarata
60bea844b3 Merge branch 'v2_final' into devel_switch_v2 2015-05-28 15:27:09 -05:00
James Cammarata
2bad888f28 Merge branch 'v2_final' into devel_switch_v2 
Conflicts:
	lib/ansible/inventory/__init__.py
	lib/ansible/modules/core
	lib/ansible/utils/__init__.py
	lib/ansible/utils/module_docs.py
 2015-05-28 15:26:03 -05:00
Toshio Kuratomi
afc19894e1 Make fetch_url check the server's certificate on https connections 2015-05-28 13:20:40 -07:00
Toshio Kuratomi
1ccf2a4685 Make fetch_url check the server's certificate on https connections 2015-05-28 12:35:37 -07:00
James Cammarata
e59d4f3b51 More module_utils/basic.py unit tests for v2 2015-05-28 01:26:04 -05:00
Toshio Kuratomi
388827a636 Update submodule ref 2015-05-27 20:28:29 -07:00
Toshio Kuratomi
b72a912562 Update submodule refs 2015-05-27 06:50:46 -07:00
James Cammarata
339a02c384 Started reworking module_utils/basic unit tests (v2) 2015-05-27 03:21:15 -05:00
Toshio Kuratomi
ea4421d10e Update submodule refs 2015-05-26 15:33:47 -07:00
Toshio Kuratomi
f1ab1c48f4 Update submodule refs for v2 2015-05-26 12:38:26 -07:00
Brian Coca
3865c5051b Merge pull request #11058 from srvg/bug/11017 
limit extensions for files in group/host_vars dir
 2015-05-26 15:31:12 -04:00
Toshio Kuratomi
d793ed360b Fix syntaxerror in the required_if arg spec check 2015-05-26 11:30:06 -07:00
Toshio Kuratomi
0f23d8a503 Fix syntaxerror in the required_if arg spec check 2015-05-26 11:29:35 -07:00
Brian Coca
7c6ebcab6d Merge pull request #11073 from msabramo/include_more_info_in_errors 
Include more info when a task fails
 2015-05-26 14:26:50 -04:00
Monty Taylor
31609e1b16 Add required_if to AnsibleModule 
There is a common pattern in modules where some parameters are required
only if another parameter is present AND set to a particular value. For
instance, if a cloud server state is "present" it's important to
indicate the image to be used, but if it's "absent", the image that was
used to launch it is not necessary. Provide a check that takes as an
input a list of 3-element tuples containing parameter to depend on, the
value it should be set to, and a list of parameters which are required
if the required parameter is set to the required value.
 2015-05-26 11:21:38 -07:00
Toshio Kuratomi
c6b286424f Merge pull request #9423 from emonty/features/required-if 
Add required_if to AnsibleModule
 2015-05-26 11:20:40 -07:00
Marc Abramowitz
d0a154c446 Include more info when a task fails 
Adds "playbook", "role", and "task" fields to the output when a task fails.

This makes it easier to pinpoint where the problem is, especially
when you have a lot of roles and playbooks.

e.g.:

    failed: [vagrant] => {..."playbook": "/Users/marca/dev/ansible/vagrant.yml",
                          ..."role": "pythonapp",
                          ..."task": "pip install -r /opt/src/{{ sm_app_role }}/requirements.txt"...}
 2015-05-26 09:25:12 -07:00
Stefan Midjich
540c23dfce this fixes ansible on openbsd and freebsd systems. only tested on openbsd. 2015-05-26 12:04:35 -04:00
Brian Coca
16c70dd7d4 added equivalent of #9636 to v2 2015-05-26 11:55:52 -04:00
Brian Coca
6000db7e5d Merge pull request #9636 from Batmat/fix-message-i18n-parsing-error 
Setting LC_MESSAGES: prevent unparseable messages (fixes issue #9635)
 2015-05-26 11:49:56 -04:00
Toshio Kuratomi
5f246dc1a6 Update extras submodule for doc fixes 2015-05-25 09:35:40 -07:00
Toshio Kuratomi
dcc691f462 Update submodule refs 2015-05-25 09:23:04 -07:00
Brian Coca
eaddc0b309 removed duplicate retry config entries 2015-05-25 11:06:04 -04:00
Etienne CARRIERE
3775dd5ec8 Factor F5 primitives 2015-05-25 09:53:23 +02:00
Serge van Ginderachter
b6ea8de399 limit extensions for files in group/host_vars dir 
inventory vars: make loading from a directory obey the same rules as
when checking the base paths, looking at the file name extensions
as defined in CONSTANTS.YAML_FILENAME_EXTENSIONS

Fixes Github issue #11017
 2015-05-23 20:34:08 +02:00
James Cammarata
ed4df57361 Submodule update for devel 2015-05-22 13:30:00 -05:00
James Cammarata
ecd5eb902d Adding unit tests for ConnectionInformation (v2) 2015-05-22 03:32:40 -05:00
Toshio Kuratomi
16c2de84ec Update the submodule refs 2015-05-21 10:00:25 -07:00
Toshio Kuratomi
13253f9c68 Merge pull request #10565 from bcoca/with_sequence_expand 
made sequence more flexible
 2015-05-21 08:05:17 -07:00
Toshio Kuratomi
04e15ab54f Update v2 submodule refs 2015-05-21 07:59:02 -07:00
James Cammarata
9921a1d2be Unit tests for base strategy class (v2) 2015-05-21 02:03:59 -05:00
Toshio Kuratomi
bb81f025b0 Merge pull request #8679 from j0057/support-arch-8653 
Add support for Arch to module_utils.basic.py
 2015-05-20 22:57:54 -07:00
Toshio Kuratomi
cc51e6b7c2 Update submodule refs in v2 2015-05-20 18:12:09 -07:00
Toshio Kuratomi
3b5a3aa80a Update submodule refs 2015-05-20 17:58:40 -07:00
Toshio Kuratomi
b48be7c484 Update submodule refs for v2 2015-05-19 14:27:54 -07:00
Toshio Kuratomi
73804b375e Update submodule ref for core doc update 2015-05-19 14:24:16 -07:00
Toshio Kuratomi
b93674b380 Update submodule refs 2015-05-19 14:19:17 -07:00
Rene Moser
8da580a29c basic: fix ValueError if value of a type='int' is not an int 
With this fix, we get a friendly error message:

    failed: [localhost] => {"failed": true}
    msg: value of argument start_port is not of type int and we were unable to automatically convert
 2015-05-19 11:51:56 -04:00
Rene Moser
8f29ca23ae basic: fix ValueError if value of a type='int' is not an int 
With this fix, we get a friendly error message:

    failed: [localhost] => {"failed": true}
    msg: value of argument start_port is not of type int and we were unable to automatically convert
 2015-05-19 17:40:46 +02:00
Brian Coca
9a88e0fc8e removed empty choices from files 2015-05-19 10:46:44 -04:00
Brian Coca
da6d15d1f9 removed empty choices from files 2015-05-19 10:46:20 -04:00
James Cammarata
21fa385ce7 Reorganizing plugin unit tests and adding start of strategy tests (v2) 2015-05-18 17:26:59 -07:00
Hugh Saunders
2e07567c16 Retry exec command via ssh_retry 
This PR adds the option to retry failed ssh executions, if the failure
is caused by ssh itself, not the remote command. This can be helpful if
there are transient network issues. Retries are only implemented in the
openssh connection plugin and are disabled by default. Retries are
enabled by setting ssh_connection > retries to an integer greater
than 0.

Running a long series of playbooks, or a short playbook against a large
cluster may result in transient ssh failures, some examples logged
[here](https://trello.com/c/1yh6csEQ/13-ssh-errors).

Ansible should be able to retry an ssh connection in order to survive
transient failures.

Ansible marks a host as failed the first time it fails to contact it.
 2015-05-18 14:22:52 -07:00
Toshio Kuratomi
f083ca747a Update submodule ref to fix postgres_user 2015-05-18 12:46:31 -07:00
Toshio Kuratomi
e69c7f5474 Update modules refs 2015-05-18 12:08:45 -07:00
Toshio Kuratomi
5343c99cb1 Update submodule pointers 2015-05-18 09:25:15 -07:00
Toshio Kuratomi
684e30a5f4 Update submodule refs 2015-05-18 09:00:16 -07:00
Brian Coca
16df2726ca Merge pull request #11018 from tyll/ed25519 
facts: Add ed25519 ssh pubkey
 2015-05-18 08:15:11 -04:00
Toshio Kuratomi
525de8b7cf Fix codecs.escape_decode() usage 2015-05-17 09:28:48 -07:00
Toshio Kuratomi
8f71e47a73 Update core and extras module refs 2015-05-17 09:23:39 -07:00
Toshio Kuratomi
8e2938c997 Update core module ref for lineinfile fix 2015-05-17 09:22:31 -07:00
James Cammarata
9aa8676bdd More template unit tests for v2 2015-05-17 01:06:02 -05:00
Brian Coca
718898891e Merge pull request #11011 from bcoca/fuse_selinux_fix 
attempt to fix selinux context on fuse filesystems
 2015-05-15 18:07:35 -04:00
Till Maas
02d784598f facts: Simplify ssh key fetching 2015-05-15 22:36:13 +02:00
Till Maas
e7846343e5 facts: Add ed25519 ssh pubkey 2015-05-15 22:25:20 +02:00
Toshio Kuratomi
5a94720905 Pull in a lot more doc fixes 2015-05-15 12:12:45 -07:00
Toshio Kuratomi
674d1016c0 Update extras ref for doc fix 2015-05-15 11:52:57 -07:00
Toshio Kuratomi
b0448d9cf4 Update submodule refs 2015-05-15 11:34:54 -07:00
Brian Coca
0913b8263c made special treatment of certain filesystem for selinux configurable 2015-05-15 13:52:27 -04:00
Toshio Kuratomi
2e31a67532 Update module refs in v2 2015-05-15 10:42:41 -07:00
Brian Coca
e2de336a23 made special treatment of certain filesystem for selinux configurable 2015-05-15 13:19:15 -04:00
James Cammarata
ac7dce4631 Fixing broken set_extra_vars method after fixing unit tests (v2) 2015-05-15 10:45:55 -05:00
James Cammarata
48d62fd934 Cleaning up VariableManager tests (v2) 2015-05-14 20:10:31 -05:00
Toshio Kuratomi
b91ce29007 Go to next task when we get an error in linear 2015-05-13 12:52:51 -07:00
James Cammarata
b94e2a1f4e Fixing bugs related to parsing and fixing up parsing integration tests (v2) 2015-05-13 11:27:12 -05:00
Brian Coca
b85ce38834 slight changes to error handling to align with v1 2015-05-13 11:15:32 -04:00
Toshio Kuratomi
892fba265b Update to fix documentation build 2015-05-13 08:15:12 -07:00
Toshio Kuratomi
0a1dc74463 Update submodule refs 2015-05-13 07:52:13 -07:00
Toshio Kuratomi
079fca27a2 Update module refs for v2 2015-05-13 06:57:04 -07:00
James Cammarata
830225d9c1 Fix errors in subelements lookup plugin and associated tests (v2) 2015-05-12 15:09:03 -05:00
James Cammarata
4d999f8fe0 Fix logic error in parent attribute retrieval for blocks/roles (v2) 2015-05-12 15:08:35 -05:00
James Cammarata
b03b7892f8 Fix method of exiting task loop (v2) 2015-05-12 13:09:08 -05:00
Toshio Kuratomi
d0d0e9933f Update module refs in v2 2015-05-12 11:05:58 -07:00
Serge van Ginderachter
9b646dea41 Add optional 'skip_missing' flag to subelements 2015-05-12 12:52:16 -05:00
James Cammarata
1ca8cb8553 Fixing up v2 unit tests 2015-05-12 12:24:57 -05:00
James Cammarata
361eb29146 Also make task_executor connect explicitly (v2) 2015-05-12 11:30:08 -05:00
James Cammarata
3697d6582f Connection plugins no longer auto-connect (v2) 
Also fixed a bug in ssh.py where an attribute was being inappropriately
initialized in the _connect() method instead of __init__()
 2015-05-12 11:23:40 -05:00
Brian Coca
09605706d9 relly fix it this time 2015-05-12 12:26:20 -04:00
Brian Coca
12a800c0e7 fixed less opts issue 2015-05-12 12:24:32 -04:00
Brian Coca
8fdf9ae59b moved module_doc_fragments to v2 2015-05-12 12:18:55 -04:00
Toshio Kuratomi
6918a588c6 Update the extras module ref 2015-05-12 08:44:24 -07:00
James Cammarata
75b2082529 Submodule update 2015-05-12 10:33:19 -05:00
Toshio Kuratomi
490cde3cbd Add python2.6+ as a documented requirement for rackspace modules 2015-05-11 12:25:03 -07:00
James Cammarata
fd321355d6 Adding 'role_path' to VariableManager "magic" variables (v2) 2015-05-11 14:04:17 -05:00
James Cammarata
7b1c6fbab9 Fix playbook includes so tags are obeyed (v2) 2015-05-11 12:48:03 -05:00
Toshio Kuratomi
c80c5c980d Add python2.6 dep to aws and cloudstack doc fragments 2015-05-11 10:10:58 -07:00
James Cammarata
daf533c80e V2 fixes 
* PluginLoader class will now be more selective about loading some
  plugin classes, if a required base class is specified (used to avoid
  loading v1 plugins that have changed significantly in their apis)
* Added ability for the connection info class to read values from a
  given hosts variables, to support "magic" variables
* Added some more magic variables to the VariableManager output
* Fixed a bug in the ActionBase class, where the module configuration
  code was not correctly handling unicode
 2015-05-11 11:29:48 -05:00
Toshio Kuratomi
f141ec9671 Update v2 module refs 2015-05-11 09:28:19 -07:00
Toshio Kuratomi
ebb4695da8 Update the submodule pointers 2015-05-11 09:09:00 -07:00
Monty Taylor
cd14d73be8 Add defaults and a link to os-client-config docs 2015-05-11 08:10:37 -04:00
Monty Taylor
d2782f0d84 Remove unneeded required_one_of for openstack 
We're being too strict - there is a third possibility, which is that a
user will have defined the OS_* environment variables and expect them to
pass through.
 2015-05-11 08:06:21 -04:00
Brian Coca
d1977dad23 started implementing syntax check 2015-05-08 19:19:03 -04:00
Toshio Kuratomi
7f21f270d9 Be more lenient in instance check: MutableMapping is more general than dict 2015-05-08 13:18:19 -07:00
Toshio Kuratomi
3a87b2727d Fix format strings for python2.6 2015-05-08 13:11:04 -07:00
Brian Coca
a6683ba2b8 Merge pull request #10958 from resmo/fix/cloudstack_variable_typo 
cloudstack: fix typo in variable, fixes get_domain()
 2015-05-08 14:31:49 -04:00
Brian Coca
56c9614e74 made playbook include taggable, removed unused conditional import 2015-05-08 14:26:06 -04:00
Toshio Kuratomi
e6844f7e6c Update core module ref for mysql fix 2015-05-08 10:41:31 -07:00
Rene Moser
62ccc1b9b6 cloudstack: fix typo in variable, fixes get_domain() 2015-05-08 16:42:07 +02:00
James Cammarata
0f1eb3cfc2 Better fix for serializing/deserializing cache plugins (v2) 2015-05-07 23:56:33 -05:00
James Cammarata
cd6d1f9221 Fix pickling errors with cache plugins (v2) 
Fixes #10945
 2015-05-07 21:15:02 -05:00
James Cammarata
198476e345 Cleaning up some portions of synchronize action plugin (v2) 2015-05-07 13:06:51 -05:00
James Cammarata
8db21f99b7 Set the inventory on the variable manager for the adhoc cli usage (v2) 2015-05-07 12:53:59 -05:00
Matt Martz
88e8ecb620 Actually get the synchronize action plugin to work 2015-05-07 12:27:30 -05:00
Matt Martz
4f4df29cb0 Add ability to specify using ssh_args in synchronize for v2 2015-05-07 11:38:15 -05:00
Toshio Kuratomi
cee7cd5d3b Update v2 module refs 2015-05-07 08:29:04 -07:00
Toshio Kuratomi
bc4d51a4fd Update module refs 2015-05-07 08:17:25 -07:00
James Cammarata
1152c7327a Fix serialization bug for plugins (v2) 2015-05-06 15:18:37 -05:00
James Cammarata
4f28a814ae Return a list instead of tuple when password is specified to ssh connection plugin (v2) 2015-05-06 08:47:23 -05:00
Toshio Kuratomi
7733dc7bb5 Fix for new octal syntax 2015-05-06 06:41:16 -07:00
Toshio Kuratomi
79fe1901f6 Update module pointers for v2 2015-05-06 06:05:44 -07:00
Toshio Kuratomi
374ea10e6f Update the core module pointer 2015-05-06 06:02:33 -07:00
James Cammarata
50542db0be Make the default playbook name an empty string (v2) 2015-05-06 02:56:52 -05:00
James Cammarata
8214ac7841 Add serializer/deserializer to plugin base object (v2) 
Fixes #10923
 2015-05-06 01:31:02 -05:00
James Cammarata
d34b586eb6 Add ability for connection plugins to set attributes based on host variables (v2) 2015-05-05 16:40:11 -05:00
Toshio Kuratomi
9b95c22dc0 Update for doc fixes 2015-05-05 13:59:00 -07:00
Toshio Kuratomi
6cbff51408 Pick up documentation fixes 2015-05-05 13:51:22 -07:00
Toshio Kuratomi
4839243366 Documentation fixes 2015-05-05 13:51:22 -07:00
James Cammarata
8fae2abed4 Properly fail out of the task loop in the linear strategy on failures (v2) 2015-05-05 13:41:32 -05:00
James Cammarata
fba5588028 Handle empty role definitions in YAML (v2) 2015-05-05 13:17:04 -05:00
James Cammarata
f5471186f9 Merge branch 'v2_final' of https://github.com/ansible/ansible into v2_final 2015-05-04 16:39:18 -05:00
James Cammarata
8f504dacdd Merge branch 'devel' into v2_final 
Conflicts:
	lib/ansible/modules/core
	v2/ansible/modules/core
	v2/ansible/modules/extras
 2015-05-04 16:35:11 -05:00
Toshio Kuratomi
c488ea019f Fix cs_instance docs 2015-05-04 13:52:48 -07:00
Brian Coca
17e65b45d0 Merge pull request #10913 from bcoca/sudosu_ask_fix 
now properly inherit data from ansible.cfg for sudo/su ask pass
 2015-05-04 16:51:19 -04:00
Brian Coca
124a0d3519 now properly inherits from ansible.cfg sudo/su ask pass 
fixes #10891
 2015-05-04 16:45:43 -04:00
Brian Coca
b23a879273 now properly inherit data from ansible.cfg for sudo/su ask pass 
fixes #10891
 2015-05-04 16:42:25 -04:00
Toshio Kuratomi
cbde1c5ec0 Fix extending non-dict types from doc fragments 2015-05-04 13:39:07 -07:00
Toshio Kuratomi
b19d426f0b Normalize the way requirements is specified 2015-05-04 13:39:07 -07:00
James Cammarata
99909b08ba Submodule update 2015-05-04 15:06:00 -05:00
Toshio Kuratomi
fdb0591877 Update module pointers 2015-05-04 12:06:02 -07:00
Toshio Kuratomi
61ec84ef71 Update module refs 2015-05-04 11:09:54 -07:00
Brian Coca
1194195b1a smoother commands with less quotes for pbrun 2015-05-04 11:38:28 -04:00
Brian Coca
795a45fa4a Merge pull request #10833 from resmo/feature/extend_cloudstack_utils 
cloudstack: extend and fix cloudstack utils
 2015-05-04 10:49:57 -04:00
James Cammarata
803fb397f3 Fixing filter plugins directory from switch 2015-05-04 01:33:10 -05:00
James Cammarata
249fd2a7e1 Re-adding submodules after moving things around 2015-05-03 22:30:51 -05:00
James Cammarata
ce3ef7f4c1 Making the switch to v2 2015-05-03 21:47:26 -05:00
Rene Moser
333c623b35 cloudstack: implement account und domain support in utils 2015-05-03 14:59:44 +02:00
Rene Moser
af74d7f1a9 cloudstack: add get_domain() and get_account() to utils 2015-05-03 14:34:25 +02:00
Michael Scherer
8d324e6a50 Fix pylint error on "cachefile does not exist" 
Since cachefile is used to show the error message when stat
fail, the variable need to be declared.
 2015-05-01 13:57:13 -04:00
Brian Coca
0951a74ea0 Merge pull request #10893 from sidick/fix_fetch_url_with_custom_https_port 
Allow the use of HTTP on custom ports in the fetch_url function
 2015-05-01 12:35:42 -04:00
Rene Moser
034ac8ae78 cloudstack: _has_changed() should not compare None values 2015-05-01 17:25:06 +02:00
Toshio Kuratomi
428f667497 Update module refs 2015-05-01 08:19:02 -07:00
Simon Dick
6e65ccabc3 Allow the use of HTTP on custom ports in the fetch_url function 2015-05-01 13:52:29 +01:00
Toshio Kuratomi
1c250ee4e7 Pull in route53 fix 2015-04-30 20:07:36 -07:00
Toshio Kuratomi
df881b7f37 Update core module ref for docker fix 2015-04-30 19:10:52 -07:00
Toshio Kuratomi
f2afd1a248 Update core pointer to pick up docker fix 2015-04-30 17:44:38 -07:00
Toshio Kuratomi
b851ce29e9 Update core modules to pick up mysql_user fix 2015-04-30 12:55:59 -07:00
Toshio Kuratomi
dabf16a714 Update core module pointers for v1 and v2 2015-04-30 08:09:28 -07:00
Brian Coca
4e85419257 Merge pull request #10853 from cgar/spelling 
just a few spelling error changes

I swear only 95% of those are mine!
 2015-04-30 09:02:09 -04:00
Rene Moser
b11cd73df1 cloudstack: add tag support in utils 2015-04-29 21:06:58 +02:00
Toshio Kuratomi
8b620640b0 Update extras submodule refs to pick up docs fixes 2015-04-28 11:13:29 -07:00