Commit Graph

16 Commits (1718719d779038751b96ffc7300efe6e5c9cee37)

Author SHA1 Message Date
James Cammarata 8afa090417 Resolving differences in core modules post-merge 2016-12-08 11:25:36 -05:00
Toshio Kuratomi 7319104552 Refreshed metadata for core modules 2016-12-08 11:25:35 -05:00
Lars Van Casteren 0a435058a5 Docs update for `os_security_group` (#5531)
The example used equal characters and not colon characters.
2016-12-08 11:25:27 -05:00
David Shrewsbury dcbbd72cfd Wrap calls to main() with if check
A change was merged to the main Ansible core code that can cause

a potential hang if any libraries are called that use threading.

This change was:

  4b0aa1214c

This affected the os_object module by causing a hang on the shade

create_object() API call (which in turn calls swiftclient which

uses threading). The fix is to make sure all modules have a main()

that is wrapped with an "if __name__ == '__main__'" check.
2016-12-08 11:24:16 -05:00
David Shrewsbury aed44e8886 Fix OpenStack module failure output
The exception message, when shade fails, will contain much more
specific information about the failure if the exception is treated
as a string. The 'message' attribute alone is usually not helpful.
2016-12-08 11:24:00 -05:00
Lars Kellogg-Stedman 45012ea723 allow empty description attribute for os_security_group
The `os_security_group` module would fail if there was no `description:`
attribute:

    localhost | FAILED! => {
        "changed": false,
        "failed": true,
	"msg": "Error creating security group larstest: Invalid input for
	description. Reason: 'None' is not a valid string."
    }

This commit makes the default description `''` rather than `None`.
2016-12-08 11:23:43 -05:00
Monty Taylor 186fbd7645 Remove duplicate shade requirement 2016-12-08 11:23:10 -05:00
Monty Taylor 73cb529d2c Make sure we're always returning objects too 2016-12-08 11:23:10 -05:00
dagnello 072110c757 Resolving secgroup.id issue in this module
secgroup['id'] was not being returned in all cases where the
specified security group exists.
2016-12-08 11:23:10 -05:00
Monty Taylor 8ff71a3fa8 Actually use changed variable 2016-12-08 11:23:09 -05:00
Monty Taylor 4125b576e9 Return the secgroup for all present states 2016-12-08 11:23:09 -05:00
Monty Taylor 89f95471f8 Return secgroup, not just id 2016-12-08 11:23:09 -05:00
David Shrewsbury 6527f895a1 Remove 'result' value
This value is pretty much useless, and a holdover from the old
module code. Let's remove it.
2016-12-08 11:23:08 -05:00
David Shrewsbury 7f0da6d851 Update the docstring for os_security_group
Indicate that idempotence is on security group names, and give
an example for updating a security group description.
2016-12-08 11:23:08 -05:00
David Shrewsbury 640dbee643 Update for latest shade API
Shade version 0.7.0 introduces new API methods for creating,
deleting, and updating security groups. Let's use those and
clean up the module.
2016-12-08 11:23:08 -05:00
Monty Taylor 234a6c93c7 Add OpenStack Security Group support
Two modules - one for security groups and one to manage rules in a
security group.
2016-12-08 11:23:07 -05:00