Commit graph

6941 commits

Author SHA1 Message Date
Toshio Kuratomi
089dcbf437 Merge pull request #2022 from pwnall/patch-1
os_server: nice error when flavor not found
2015-09-05 08:09:32 -07:00
Victor Costan
2ae37e7845 os_server: nice error when flavor not found
When we can't find the VM flavor that the user requests, this change replaces the non-descript stack trace with a clear error message.
2015-09-04 20:46:26 -04:00
Toshio Kuratomi
6e5a832dc2 Fix read-only usage to depend on the docker-py and docker server version 2015-09-04 15:59:19 -07:00
Toshio Kuratomi
a4149a37ba Merge pull request #2011 from ansible/docker-merge-hostconfig-methods
We had two separate methods trying to do the same thing but neither o…
2015-09-04 12:37:17 -07:00
Brian Coca
8f31323b5c Merge pull request #1862 from SinisterLight/devel
checking remote_group_id while comparing os_security_group_rule
2015-09-04 12:48:59 -04:00
Brian Coca
d55a4d59dc Merge pull request #1956 from cchurch/strict_mode_fixes
Update core modules to fix strict mode errors
2015-09-04 12:48:23 -04:00
Brian Coca
d8f45bab41 Merge pull request #1607 from abriening/win_get_url_updates
Adds basic authentication & skip certificate validation to win_get_ur…
2015-09-04 12:47:19 -04:00
Brian Coca
57c0b86db4 Merge pull request #721 from jinowolski/devel
update git remote url before ls-remote
2015-09-04 12:46:51 -04:00
Toshio Kuratomi
1f358f349b We had two separate methods trying to do the same thing but neither one was complete. This merges them so that all of the options get parsed and applied. 2015-09-03 15:39:18 -07:00
Toshio Kuratomi
2520627fe7 Make sure listener ports are ints.
May fix #1984
2015-09-03 08:47:27 -07:00
Benno Joy
2f42cd4b2c Merge pull request #1951 from galindro/ec2_asg_termination_policies
Added termination_policies option
2015-09-03 17:35:06 +05:30
Brian Coca
e278f285aa partially reverted previous change to deal with systemctl show status not returning errors on missing service
Now it looks for not-found key instead of running status which does return error codes when service is present but in diff states.
fixes #12216
2015-09-02 17:11:30 -04:00
James Cammarata
6df6e5977e Merge pull request #2000 from jsmartin/os_server_fix
Adds sanity check to make sure nics is a list.
2015-09-02 12:08:38 -04:00
James Martin
c54f875fdd Adds sanity check to make sure nics is a list. 2015-09-02 11:02:31 -05:00
Charles Paul
6a40e8b454 vm_floppy 2.0 support 2015-09-01 14:53:11 -05:00
Chrrrles Paul
7106d0f914 Merge pull request #1996 from ansible/revert-1995-revert-1720-feature-virtual-floppy
Apologies for double reversion, git workflow error -- Revert "Add 2.0 docs - Revert "add virtual floppy to VMware guest""
2015-09-01 10:57:06 -05:00
Chrrrles Paul
8ebd6cc7cd Revert "Add 2.0 docs - Revert "add virtual floppy to VMware guest"" 2015-09-01 10:55:10 -05:00
Chrrrles Paul
5ae5be2168 Merge pull request #1995 from ansible/revert-1720-feature-virtual-floppy
Add 2.0 docs - Revert "add virtual floppy to VMware guest"
2015-09-01 10:49:57 -05:00
Chrrrles Paul
3830af652f Revert "add virtual floppy to VMware guest" 2015-09-01 10:47:43 -05:00
Brian Coca
bbcfb1092a check systemctl status before show as show will not return antyhing other than rc=0 even when it fails. 2015-09-01 10:58:15 -04:00
Brian Coca
68ab025dac minor doc fixes 2015-09-01 10:58:15 -04:00
Chrrrles Paul
943a892435 Merge pull request #1720 from nivanko/feature-virtual-floppy
Useful addition to vsphere_guest and the code looks good.  I will do more testing.  Merging into devel branch -- add virtual floppy to VMware guest
2015-09-01 09:26:20 -05:00
Benno Joy
26928dd7c6 Merge pull request #1990 from rickmendes/usability-enhancements
using single device_id and enabling release on disassociation
2015-09-01 18:00:11 +05:30
Benno Joy
b5db274362 Merge pull request #1940 from jcowley/s3-permissions
Add support for S3 canned permissions. resolves #1939
2015-09-01 09:15:15 +05:30
Brian Coca
0bff493fae Merge pull request #1989 from mgedmin/patch-1
authorized_key: fix example in documentation
2015-08-31 20:30:50 -04:00
Toshio Kuratomi
06fc029f73 Remove non-ascii quote char 2015-08-31 15:09:50 -07:00
Rick Mendes
a18c96882e using single device_id and enabling release on disassociation 2015-08-31 09:06:18 -07:00
Marius Gedminas
5595a9f81d authorized_key: fix example in documentation
'key=' cannot be pointing to a file name; it needs to be the key itself as a string (or a URL).
2015-08-31 09:08:35 +03:00
Brian Coca
ef1f31c652 Merge pull request #1986 from caphrim007/add-kali-linux-support-to-hostname-module
Add hostname support for Kali linux 2.0
2015-08-30 20:05:38 -04:00
Tim Rupp
48f522455d Add hostname support for Kali linux 2.0
This patch allows the hostname module to detect and set the hostname for a
Kali Linux 2.0 installation. Without this patch, the hostname module raises
the following error

   hostname module cannot be used on platform Linux (Kali)

Kali is based off of Debian.
2015-08-28 20:35:24 -07:00
Chrrrles Paul
5fc4f9d876 Merge pull request #1982 from lowwalker/patch-2
Merging, good catch -- updated examples
2015-08-28 14:12:58 -05:00
Brian Coca
6b15fc6259 Merge pull request #1983 from lowwalker/patch-3
removed hyphens in module name in examples
2015-08-28 10:01:32 -04:00
Luke
40f2ff9fbf removed hyphens in module name in examples 2015-08-28 08:46:45 -04:00
Luke
a4aa29edd9 updated examples
When testing with existing example, I received errors about auth block not being ingested. After adding the auth block, name and state with "=" caused syntax errors.
2015-08-28 08:34:05 -04:00
Benno Joy
66288d48a2 Merge pull request #1703 from haad/ec2_start_stop_by_tag
Rebase start/stop by instance tag
2015-08-27 14:46:54 +05:30
Benno Joy
512b485a90 Merge pull request #1871 from evanccnyc/devel
Adding the ability to associate eips with network interfaces on Amazon EC2
2015-08-27 13:51:28 +05:30
Benno Joy
7fe0de5a3a Merge pull request #1974 from tima/rds-timeout-err
Fixed RDS timeout error that calls non-existent attribute
2015-08-27 12:17:22 +05:30
Benno Joy
aafb04e914 Merge pull request #1969 from mgedmin/fix-1678
apt: check for "0 upgraded" to be at the beginning of the line
2015-08-27 12:15:14 +05:30
Benno Joy
8bf800d5c5 Merge pull request #1973 from mgedmin/user-no-ssh-keygen-in-check-mode
user: don't generate SSH keys in check mode
2015-08-27 12:13:06 +05:30
Timothy Appnel
2ba32a8b10 Clarified and cleaned up grammar of error messages. 2015-08-26 11:59:31 -04:00
Timothy Appnel
0e42b1708b Fixed call to undefined attribute when RDS module timeouts waiting. 2015-08-26 11:58:16 -04:00
Brian Coca
8cc9fdde4a Merge pull request #1952 from manics/authorized_key-check_mode-user_path
Don't fail in authorized_key check_mode if user exists
2015-08-26 08:00:35 -04:00
Marius Gedminas
4ae4331a6b user: don't generate SSH keys in check mode
Fixes https://github.com/ansible/ansible/issues/11768

Test plan:

- (in a Vagrant VM) created a user 'bob' with no ssh key
- ran the following playbook in check mode:

    ---
    - hosts: trusty
      tasks:
        - user: name=bob state=present generate_ssh_key=yes

- saw that ansible-playbook reported "changes=1"
- saw that /home/bob/.ssh was still absent
- ran the playbook for real
- saw that /home/bob/.ssh was created
- ran the playbook in check mode again
- saw that ansible-playbook reported no changes
- tried a variation with a different username for a user that didn't
  exist: ansible-playbook --check worked correctly (no errors, reported
  "changed")
2015-08-26 08:51:52 +03:00
Marius Gedminas
eb17b6a36c apt: check for "0 upgraded" to be at the beginning of the line
Fixes #1678.
2015-08-25 19:15:33 +03:00
Brian Coca
116793889f Merge pull request #1915 from leedm777/patch-1
ec2_vol: Added missing "needs 2.0" doc
2015-08-24 18:44:15 -04:00
Toshio Kuratomi
b29276df34 Merge pull request #1204 from detiber/test_rhsm
bugfixes for redhat_subscription
2015-08-24 12:54:03 -07:00
Brian Coca
aae5177164 Merge pull request #1966 from tback/devel
Delete dead and broken code
2015-08-24 14:20:10 -04:00
Till Backhaus
39e7e05a8d Delete dead and broken code 2015-08-24 20:06:53 +02:00
Brian Coca
bc6a8761a1 Merge pull request #1958 from omriiluz/Bugfix-for-1957
No need for .keys on volumes list
2015-08-23 14:01:47 -04:00
Omri Iluz
daf7a0551b No need for .keys on volumes list
Since c3f92cca21 changed "volumes" to be a list instead of a dictionary, we don't need (and cannot) .keys when appending to set.
Reported as bug #1957
2015-08-23 02:29:39 -07:00