Commit graph

8979 commits

Author SHA1 Message Date
James Cammarata
bb5da4c5f6 Merge branch 'devel' of https://github.com/josephtate/ansible into josephtate-devel
Conflicts:
	library/cloud/ec2
2014-02-26 13:57:07 -06:00
James Cammarata
d6b912c429 Modifying the wait logic for newly created images to avoid tracebacks
Fixes #4619
2014-02-26 13:33:31 -06:00
James Tanner
a37a6983be Switch from skipIf to SkipTest for TestVaulLib 2014-02-26 14:01:31 -05:00
James Cammarata
b758ed9417 Merge pull request #6150 from hkariti/fix_join_bug
Fix incorrect use of .join on list causing a traceback
2014-02-26 12:50:07 -06:00
James Tanner
f5359c310f Add negative tests for VaultLib 2014-02-26 13:38:58 -05:00
James Cammarata
96f1c3ce2e Move where the expanduser call is made, to avoid issues with None 2014-02-26 12:33:17 -06:00
James Cammarata
e659d55d62 Merge branch 'devel' of https://github.com/muffl0n/ansible into muffl0n-devel 2014-02-26 12:28:26 -06:00
James Cammarata
5ff20c1ae7 Merge branch 'scottanderson42-ec2-params' into devel 2014-02-26 11:38:36 -06:00
James Tanner
baed7a0ed9 Fixes #6187 Add unit tests for VaultLib 2014-02-26 12:10:09 -05:00
Michael DeHaan
33857855ad removing some unusued files. Paramiko alt was an experiment to attempt pipeline for paramiko, ssh_old is the non-pipelining-supported earlier
version of the OpenSSH transport, which is configurable now and unified.
2014-02-26 11:26:52 -05:00
James Tanner
35def422a3 Addresses #6188 Add --vault-password-file to bin/ansible and bin/ansible-playbook 2014-02-26 11:01:03 -05:00
James Cammarata
8a7c68dc18 Merge branch 'ec2-params' of https://github.com/scottanderson42/ansible into scottanderson42-ec2-params
Conflicts:
	lib/ansible/module_utils/ec2.py
	library/cloud/ec2
2014-02-26 09:37:26 -06:00
James Cammarata
168e3cf685 Revert "Adding a Makefile target for integration tests - "make integration""
This reverts commit 6f1a58abd3.
2014-02-26 09:30:16 -06:00
James Cammarata
6f1a58abd3 Adding a Makefile target for integration tests - "make integration" 2014-02-26 09:26:48 -06:00
James Tanner
7acd2f3a2d Addresses #6188 Add --vault-password-file option to the ansible-vault command 2014-02-26 10:01:59 -05:00
James Tanner
1e33c96083 Update changelog for ec2_snapshot 2014-02-26 09:21:22 -05:00
Michael DeHaan
404765162d Merge pull request #6184 from patrys/patch-1
Properly match existing security group
2014-02-26 08:10:27 -05:00
Michael DeHaan
c2307b93e7 Merge pull request #6183 from gkoller/devel
mysql_db: Emphasize target is on remote host. List supported file types.
2014-02-26 08:09:59 -05:00
Patryk Zawadzki
da1efee21f Properly match existing security group
If we don't care about `vpc_id` then neither should the code.
2014-02-26 13:39:03 +01:00
Guido Kollerie
a000f37132 Emphasize target is on remote host. List supported file types.
From the documentation it is not immediately clear that the 'target'
option refers to a location on the remote host. This change emphasizes that.
In addition to .sql files, .bz2 and .gz files are supported for dumps and
restores. This is now documented.
2014-02-26 12:56:24 +01:00
jctanner
6fa898c511 Merge pull request #5092 from willthames/ec2_snapshot
Module to create EC2 snapshots
2014-02-26 06:10:17 -05:00
jctanner
1277b45b3c Merge pull request #5941 from sivel/rax-name-search-opts
rax module: Use regex start and end of string with name base filters
2014-02-26 05:56:39 -05:00
Michael DeHaan
6ed48b5ad7 Merge pull request #6172 from cchurch/devel
Fix setup module to gather facts from PowerPC Macs.
2014-02-25 19:54:23 -05:00
Chris Church
1d6bdd451b Fix setup module to gather facts from PowerPC Macs. 2014-02-25 18:27:36 -05:00
Richard Isaacson
ca78657538 Merge pull request #6166 from risaacson/rename_flatten_in_dict
Rename flatten function.
2014-02-25 15:00:36 -06:00
Richard C Isaacson
af616fe15e Rename flatten funciton.
flatten(x) is used a lot in the various lookup plugins where in each it is slightly different. This is to make this name slightly more unique.
2014-02-25 14:59:06 -06:00
James Tanner
0cca4a3919 Fixes #5255 yum: set disabled repos before enabled repos and fix the parameters used 2014-02-25 14:53:48 -05:00
Richard Isaacson
86d8c58bd2 Merge pull request #6165 from risaacson/fix_fetch_integration
Fix fails on ubuntu due to missing /etc/motd

Tests functional on centos6, ubuntu1204 and ubuntu1310 now.
2014-02-25 13:45:10 -06:00
Richard C Isaacson
2bce819519 Fix fails on ubuntu due to missing /etc/motd
Some systems that we are testing on may not have /etc/motd. So we need to create a file that we can control and use that for the further tests.
2014-02-25 13:42:33 -06:00
James Cammarata
03cb2f5ffa Merge branch 'git_version_tags' of https://github.com/j2sol/ansible into j2sol-git_version_tags 2014-02-25 13:05:29 -06:00
James Cammarata
cb79947054 Fixing the unicode issue in uri for EL6 platforms
Fixes #5869
2014-02-25 13:04:05 -06:00
Richard Isaacson
5dfe16ee5a Merge pull request #5964 from sl4mmy/with-dict
lookup_plugins: loop over hashes

Tests good with the global variables:
```
users:
  alice:
    name: Alice
    id: 12345
  luna:
    name: Luna
    id: 23456
```

and playbook tasks:
```
- name: Print records.
  debug: msg="User {{ item.key }} is {{ item.value.name }}  {{ item.value.id }}"
  with_dict: users
```
2014-02-25 12:58:08 -06:00
Kent R. Spillner
1fcc9ff666 lookup_plugins: loop over hashes
Create a lookup plugin named dict that can be used to loop over hashes.
It converts a dict into a list of key-value pairs, with attributes named
"key" and "value."  Also adds a brief explanation and simple example to
the docs.

Signed-off-by: Kent R. Spillner <kspillner@acm.org>
2014-02-25 11:20:15 -06:00
James Tanner
876035c0b1 Fixes #6161 Get the delegate host info properly from the hostvars object 2014-02-25 11:18:06 -05:00
James Tanner
e121ff111d Fix synchronize unit test to handle checkmode 2014-02-25 09:24:14 -05:00
James Tanner
9209581565 Fixes #6155 Inject checkmode into synchronize module args 2014-02-25 08:58:58 -05:00
James Cammarata
6fe369fca0 Merge branch 'usermod_fix' of https://github.com/tknguyen79/ansible into tknguyen79-usermod_fix
Conflicts:
	library/system/user
2014-02-24 23:38:51 -06:00
James Cammarata
97eededc99 Handle unicode content in the uri module properly
Fixes #5869
2014-02-24 23:34:17 -06:00
James Cammarata
a18f811b2d Merge branch 'jimi-c-issue_4620' into devel 2014-02-24 21:38:55 -06:00
James Cammarata
f23ccebbdc Merge branch 'issue_4620' of https://github.com/jimi-c/ansible into jimi-c-issue_4620 2014-02-24 20:30:25 -06:00
James Tanner
0f95a905d9 Fixes #5965 Ensure the inject for each item in a loop is un-altered 2014-02-24 20:54:26 -05:00
Richard Isaacson
abb4f2fbda Merge pull request #6160 from risaacson/pull_5775_2
Fixed up merge for the lvol module.
2014-02-24 18:56:25 -06:00
Stefan J. Betz
789ae4697c Require force for LVM shrink and remove operations in lvol. Fixes #5774
Conflicts:
	library/system/lvol
2014-02-24 18:52:35 -06:00
Michael DeHaan
05bf80751b Merge pull request #6158 from risaacson/issues_5165
If you try to resize a lvol to the current size return a changed=False and don't fail.
2014-02-24 19:17:43 -05:00
Michael DeHaan
031aaa1018 Merge pull request #6157 from rgbkrk/patch-1
Fix expires
2014-02-24 19:17:17 -05:00
Richard C Isaacson
bf30707670 If you try to resize a lvol to the current size return a changed=False and don't fail.
This addresses GH-5165 and adds the ability to check if a lvol exists.

The tests for this don't fit nicely into the current integration tests so they are below.

```
---

- name: remove any existing lv=one of vg=main
  lvol: lv=one vg=main state=absent

- name: remove any existing lv=two of vg=main
  lvol: lv=two vg=main state=absent

- name: check to see if lv=one of vg=main exists
  lvol: lv=one vg=main state=present
  ignore_errors: true
  register: lvol_result0

- name: Assert that we will get a "No size given."
  assert:
    that:
      - "'No size given.' in lvol_result0.msg"

- name: create lv=one of vg=main sized 30g
  lvol: lv=one size=30g vg=main state=present
  register: lvol_result1

- name: Assert that we made changes."
  assert:
    that:
      - "lvol_result1.changed == True"

- name: check to see if lv=one of vg=main exists
  lvol: lv=one vg=main state=present
  register: lvol_result2

- name: Assert that we did not make changes."
  assert:
    that:
      - "lvol_result2.changed == False"

- name: remove lv=one of vg=main
  lvol: lv=one vg=main state=absent

- name: create lv=two of vg=main sized 30G
  lvol: lv=two size=30G vg=main state=present
  register: lvol_result3

- name: Assert that we made changes."
  assert:
    that:
      - "lvol_result3.changed == True"

- name: reduce lv=two of vg=main to 15G
  lvol: lv=two size=15G vg=main state=present
  register: lvol_result4

- name: Assert that we made changes."
  assert:
    that:
      - "lvol_result4.changed == True"

- name: increase lv=two of vg=main to 30G
  lvol: lv=two size=30G vg=main state=present
  register: lvol_result5

- name: Assert that we made changes."
  assert:
    that:
      - "lvol_result5.changed == True"

- name: create lv=two of vg=main sized 30G when already exists at 30G
  lvol: lv=two size=30g vg=main state=present
  register: lvol_result6

- name: Assert that we did not make changes."
  assert:
    that:
      - "lvol_result6.changed == False"

- name: remove lv=two of vg=main
  lvol: lv=two vg=main state=absent
```
2014-02-24 16:56:08 -06:00
Kyle Kelley
b5eb4d2a71 Fix expires 2014-02-24 15:54:55 -06:00
James Cammarata
be0be16e89 Merge branch '5853-python-2.5-apt_repository-fix' of https://github.com/timurbatyrshin/ansible into timurbatyrshin-5853-python-2.5-apt_repository-fix 2014-02-24 15:20:29 -06:00
James Cammarata
7517cd9398 Moving the assemble test to the correct location 2014-02-24 15:19:06 -06:00
James Cammarata
4e49b32419 Adding a version note to the expanduser filter documentation 2014-02-24 14:36:13 -06:00