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

1819 commits

Author SHA1 Message Date
Feanil Patel
fbaeee5dba Output the Internet Gatewoy id directly instead of in a dict. 2015-06-01 15:52:39 -07:00
Benno Joy
4e206e3790 Fixes issue 1197 for s3 module, where the file gets downloaded even if checksums match 2015-06-01 15:52:39 -07:00
Feanil Patel
d796e8f54f Tell me what the igw id is if we created an igw. 2015-06-01 15:47:26 -07:00
James Cammarata
3256db99e2 Fixing digital_ocean documentation and a bug in os_subnet 2015-06-01 15:34:16 -07:00
Toshio Kuratomi
55d48a7a82 Finish up cleanups to modules: 
* Add python>= 2.6 to documented requirements when a module's deps need
  python>= 2.6 so we know when a module can use python2.6+ syntax
* Remove BabyJSON usage
* Change modules to use if __name__ == '__main__' so that they can
  potentially be unittested

The BabJSON changes Fixes #1211
 2015-06-01 15:34:16 -07:00
Brian Coca
145361aea3 Revert "Add deprecated documentation for _quantum_subnet" 
cause it was already added

This reverts commit 3fa32c4984.
 2015-06-01 15:24:15 -07:00
Toshio Kuratomi
9927e109b7 Add deprecated documentation for _quantum_subnet 2015-06-01 15:22:37 -07:00
Brian Coca
4348475ed3 doc fixes 2015-06-01 15:06:42 -07:00
David Shrewsbury
3692518643 Update os_subnet module for latest shade 
Shade can now handle creating, updating and deleting subnets.
This cleans up the module to take advantage of that.
 2015-06-01 15:03:44 -07:00
David Shrewsbury
abbf8a40ca Rename os_subnet to os_subnet.py 2015-06-01 15:03:44 -07:00
Monty Taylor
ef1c7eef5b Add OpenStack Subnet module 
Also deprecated old quantum_subnet module
 2015-06-01 14:59:14 -07:00
xiaclo
1fb035a346 Update route53.py 2015-06-01 14:53:42 -07:00
xiaclo
2aa793ec0e Fix issue #1156 
Fix as suggested in the issue.

https://github.com/ansible/ansible-modules-core/issues/1156
 2015-06-01 14:53:42 -07:00
Monty Taylor
ce556a053e Return a list of OpenStack clouds 
The main use of this is to feed jinja templating, so structure the
data returned slightly better for that purpose.
 2015-06-01 11:01:17 -05:00
Ryan Walls
88eddb13c0 Update docker module to avoid false positives when containers are first created. Also have the module check 
for api compatibility before trying to set a "--log-driver" option.
 2015-06-01 09:48:24 -06:00
Monty Taylor
718c13bdf2 Add OpenStack Client Config module 
All of the ansible OpenStack modules are driven by a clouds.yaml config
file which is processed by os-client-config. Expose the data returned by
that library to enable playbooks to iterate over available clouds.
 2015-05-28 16:14:20 -04:00
Tom Paine
c64a3eb03d Update vsphere_guest.py 2015-05-28 19:08:52 +01:00
Ryan Walls
c95717afe5 Set default "log_driver" option to None in docker module. 2015-05-28 11:36:20 -06:00
Ryan Walls
5f1d88a829 Update docker module to look at log_driver variable when deciding if container configuration has changed. 2015-05-27 12:33:11 -06:00
Benno Joy
415815ef45 Merge pull request #678 from Jimdo/handle-cfn-rollback-failure 
Handle the case where a Cloudformation stack rollback fails.
 2015-05-27 22:45:33 +05:30
Benno Joy
bd7e3fc8ab Merge pull request #841 from billwanjohi/encrypt-s3-object 
Encrypt s3 object
 2015-05-27 22:15:24 +05:30
Brian Coca
92c823c69a Merge pull request #1378 from aioue/patch-4 
Update vsphere_guest.py
 2015-05-27 12:20:20 -04:00
billwanjohi
40eef6c3ec s3 put: add support for server-side encryption 
- added 'encrypt' boolean option
- reordered module options alphanumerically
 2015-05-27 16:00:01 +00:00
Benno Joy
57c8547a3b Merge pull request #1333 from wimnat/feature/issue-1332 
rds module now will exit gracefully when resource=none
 2015-05-27 19:59:33 +05:30
Toshio Kuratomi
5f9592248a Minor fixups found during review of #582 2015-05-27 07:03:29 -07:00
Toshio Kuratomi
dcc04f9505 Merge branch 's3_retry' of https://github.com/stansonhealth/ansible-modules-core into stansonhealth-s3_retry 
Conflicts:
	cloud/amazon/s3.py
 2015-05-27 06:55:33 -07:00
Jonathan Davila
e2773f7554 author fix 2015-05-27 08:37:39 -04:00
Toshio Kuratomi
0ab2f81d4f Merge pull request #1411 from AndrewPashkin/add_docker_api_version_argument_to_docker_image 
Add 'docker_api_version' to docker_image
 2015-05-26 15:28:14 -07:00
Brian Coca
58c6c3dd03 Merge pull request #1046 from emonty/feature/os_network 
Add OpenStack Network module
 2015-05-26 13:46:28 -04:00
Toshio Kuratomi
ce4cc0282a Merge pull request #1394 from j2sol/feature/os_server_actions 
Add an openstack servers actions module
 2015-05-26 10:35:35 -07:00
whiter
71ad56b151 Fix for issue #1332 - when instance is has finished deleting and get_db_instance returns None, exit gracefully 2015-05-26 15:12:00 +10:00
Benno Joy
784589eede Merge pull request #1414 from wangqiang8511/issu_fix_1302 
Do instance update after add tags to instance.
 2015-05-25 07:56:55 +05:30
Wang Qiang
31f3319b56 Do instance update after add tags to instance. 2015-05-25 09:25:11 +08:00
Andrew Pashkin
27c174128b Add 'docker_api_version' to docker_image 
By default docker-py uses latest version of Docker API. This is not
always desireable, and this patch adds option to specify version, that
should be used.
 2015-05-23 23:17:30 +03:00
Ryan Walls
3f679933a6 Add support for --log-driver option that docker released with Docker 1.6 2015-05-22 16:36:38 -06:00
Tom Paine
7325d6a8ef Update vsphere_guest.py 
Remove redundant description.
 2015-05-22 19:07:28 +01:00
Tom Paine
0ec4c43931 Update vsphere_guest.py 
Spelling mistake.
 2015-05-22 19:05:25 +01:00
Tom Paine
14d7073b51 Update vsphere_guest.py 
Remove etc. As reconfigure only reconfigures RAM and CPU.
 2015-05-22 18:43:20 +01:00
Tom Paine
6a04f0d452 Update vsphere_guest.py 
Clarifies that when using a template, CPU, RAM, NIC and Disk params are silently ignored.
 2015-05-22 18:40:35 +01:00
Tom Paine
3d1b6285c3 Update vsphere_guest.py 
Clear up confusing action where disk and hardware state can be passed to a reconfigure but is ignored (module only changes CPU and RAM when state is 'reconfigured' and ignore everything else.
 2015-05-22 18:21:56 +01:00
marko
5f5be7bc2a Added support for foreign security groups (Fixes: #373) 2015-05-22 12:34:41 +02:00
Jesse Keating
a14aee5239 Add an openstack servers actions module 
This module supports a few of the server actions that are easy to
initially impiment. Other actions require input and provide return
values in the API calls that will be more difficult to impliment, and
thus are not part of this initial commit.
 2015-05-21 16:19:57 -07:00
Jamie Hannaford
7de4b13124 Fix get_launch_config var name 2015-05-21 15:52:03 +02:00
Tom Paine
3183ab6da1 Update vsphere_guest.py 
Add mounted ISO image to examples.
 2015-05-21 12:52:52 +01:00
Brian Coca
150b71f11a removed executable bit 2015-05-21 07:01:08 -04:00
Jonathan Mainguy
3a294c3379 fixes example documenation 2015-05-21 09:07:23 -04:00
Monty Taylor
6606e4f68d Add OpenStack Network module 
Also, deprecate the old quantum network module
 2015-05-20 11:41:24 -07:00
Tom Paine
ed07502587 Update vsphere_guest.py 
Add example distributed virtual switch example so vm_nic options are clearer.
 2015-05-20 16:01:29 +01:00
Brian Coca
5011593ee3 fixed typo on novaclient var 2015-05-19 10:52:48 -04:00
Tom Paine
c97af02e40 Update ec2.py 
updated default and choices to match standard
 2015-05-18 21:34:57 +01:00
Tom Paine
1f7f7c7dbc Update ec2.py 
Update instance_type description to feature up-to-date list of instance types. Matches format of 'ebs_optimized' param which also includes a link.

Update region description to feature up-to-date list of ec2 regions. Matches format of 'ebs_optimized' param which also includes a link.

Updated choices for monitoring param to be explicit bool matching default 'yes'.

Updated choices for source_dest_check to be explicit bool matching default 'true'.

Updated tenancy choices to remove redundant phrasing in comments.
 2015-05-18 21:30:18 +01:00
Toshio Kuratomi
81b476cd02 Update module "imports" to new style 
Fixes #1351
 2015-05-18 11:59:20 -07:00
Brian Coca
627593b43a Merge pull request #1347 from octplane/add_dockerfile_parameter 
Support optional dockerfile name
 2015-05-18 11:51:28 -04:00
Pierre Baillet
06e3ac7bf4 Support optional dockerfile name 2015-05-18 16:51:12 +02:00
Tom Paine
764c3ae5a4 Update ec2.py 
Make assign_public_ip choices explicit. People incorrectly try and assign a specific IP thinking it accepts an IP address as a value.
 2015-05-18 14:21:49 +01:00
Benno Joy
601fa16ada Merge pull request #1327 from bennojoy/issue_600 
fixes issue #600, where ec2 module returns instance state as running ev…
 2015-05-18 11:40:02 +05:30
Brian Coca
e1f68b7f33 Merge pull request #1323 from feanil/feanil/vpc_igw 
Tell me what the igw id is if we created an igw.
 2015-05-15 10:12:56 -04:00
Vasyl Kaigorodov
fa9727eb99 GCE module: added Service Account permissions sanity checks 2015-05-15 16:00:24 +02:00
Feanil Patel
77ca3c1148 Output the Internet Gatewoy id directly instead of in a dict. 2015-05-15 09:40:30 -04:00
Vasyl Kaigorodov
f714cc5f7e GCE module: document Service Account permissions parameter usage 2015-05-15 15:34:36 +02:00
Vasyl Kaigorodov
a0b57f3aab GCE module: add posibility to specify Service Account permissions during instance creation 2015-05-15 15:28:28 +02:00
Benno Joy
1c418805d9 Merge pull request #673 from mschurenko/ec2_elb_lb_add_stickiness 
adding stickiness support to ec2_elb_lb.py
 2015-05-15 15:01:11 +05:30
Benno Joy
dee65f83af Merge pull request #1212 from zimbatm/ec2_group-name_priority 
ec2_group: select own group if the name matches
 2015-05-15 14:47:10 +05:30
Matt Schurenko
08155f145e adding stickiness support to ec2_elb_lb.py 
removing policy if enabled is no

adding sanity checks

removing debuging

check if policy exists before deleting

updating version_added to 2.0

adding stickiness support to ec2_elb_lb.py (squashed commit)
 2015-05-14 22:30:45 -07:00
Benno Joy
d8b9c1f440 Merge pull request #1206 from mjfroehlich/ec2-support-mfa-auth 
ec2: Use get_aws_connection_info to get AWS creds.
 2015-05-14 17:46:29 +05:30
Benno Joy
ed62de6d3c Fixes issue 1197 for s3 module, where the file gets downloaded even if checksums match 2015-05-14 09:03:50 +05:30
Benno Joy
9d9d8def6f fixe issue #600, where ec2 module returns instance state as runing even after instance is terminated 2015-05-14 08:29:11 +05:30
Feanil Patel
0e213e985b Tell me what the igw id is if we created an igw. 2015-05-13 17:12:41 -04:00
Brian Coca
74351490f7 doc fix 2015-05-13 15:58:07 -04:00
whiter
da93950fe5 Added postgresql-license type 2015-05-13 16:16:41 +10:00
James Cammarata
576ca33bdc Fixing digital_ocean documentation and a bug in os_subnet 2015-05-12 10:32:43 -05:00
Jell
6b27cdc08e [ec2_vol] Find or Create volume by name 2015-05-12 07:06:37 +02:00
Toshio Kuratomi
1f99382dfb Finish up cleanups to modules: 
* Add python>= 2.6 to documented requirements when a module's deps need
  python>= 2.6 so we know when a module can use python2.6+ syntax
* Remove BabyJSON usage
* Change modules to use if __name__ == '__main__' so that they can
  potentially be unittested

The BabJSON changes Fixes #1211
 2015-05-11 13:21:17 -07:00
Toshio Kuratomi
60a66a544d Several cleanups to many modules: 
* Fix docs to specify when python2.6+ is required (due to a library
  dep).  This helps us know when it is okay to use python2.6+ syntax in
  the file.
* remove BabyJson returns.  See #1211  This commit fixes all but the
  openstack modules.
* Use if __name__ == '__main__' to only run the main part of the module
  if the module is run as a program.  This allows for the potential to
  unittest the code later.
 2015-05-11 12:15:53 -07:00
Brian Coca
18ccced5fe Merge pull request #1274 from bennojoy/issue-122 
fixes issue 122, where the module recreates the route table in each run
 2015-05-08 15:50:37 -04:00
Brian Coca
bc22ee9069 Merge pull request #1015 from jml/ec2-eip 
Make ec2_eip idempotent
 2015-05-08 15:24:20 -04:00
Jamie Hannaford
8db564dcf7 Fix attribute name for Auto Scale servers 2015-05-08 14:05:16 +02:00
Chris Lundquist
4670e1285b [ec2_ami_find] fix ami_search doc copy pasta 2015-05-07 11:51:11 -07:00
Benno Joy
e2deee66d3 fixes issue 122, where the module recreates the route table in each run 2015-05-07 16:04:01 +05:30
Ratnadeep Debnath
be66acb436 Fixed typo in cloud docker module. 2015-05-06 15:23:40 +05:30
Brian Coca
ec5cd89d7c Revert "Add deprecated documentation for _quantum_subnet" 
cause it was already added

This reverts commit 3fa32c4984.
 2015-05-05 17:14:04 -04:00
Toshio Kuratomi
3fa32c4984 Add deprecated documentation for _quantum_subnet 2015-05-05 10:50:24 -07:00
Brian Coca
a9781b3712 Merge pull request #1250 from afeinberg/patch-1 
Fix a typo in create_instances
 2015-05-05 10:40:07 -04:00
Sam Doiron
de76c797ab Fix Issue #1216 (ValueError with Amazon RDS) 
Fix typo where wrong variable was used, causing ValueError.
 2015-05-05 10:53:17 -03:00
Brian Coca
9d25d88b9a Merge pull request #1187 from chrismeyersfsu/feature-azure_delete_disks 
correctly delete disks associated with vms
 2015-05-05 08:47:03 -04:00
Herby Gillot
6ce3ef36e3 Use existing ec2_eip address if already associated 
If an EC2 instance is already associated with an EIP address, we use
that, rather than allocating a new EIP address and associating it with
that.

Fixes #35.
 2015-05-05 11:37:47 +01:00
Alex Feinberg
e749184bc7 Fix a typo in create_instances 
Fix a typo in create_instances: use 'placement_group' instead of placement_group
when calling boto_siupports_param_in_spot_request().
 2015-05-04 17:14:42 -07:00
Brian Coca
2dc0343d63 added deprecated doc entry 2015-05-04 19:42:26 -04:00
Toshio Kuratomi
f444e49dfa Fix error when container has no names. 
Rename loop variable from "i" to more informative "container"

Fixes #1188
 2015-05-04 10:16:01 -07:00
Brian Coca
a6eafb87c8 minor doc fixes 2015-05-04 12:06:57 -04:00
David Shrewsbury
28488f1b84 Update os_server for shade flavor API changes 
Latest shade fixes the flavor API so that raw objects are not
returned.
 2015-05-04 11:36:57 -04:00
Monty Taylor
3834680f43 Add OpenStack Server module 
Also deprecated old nova_compute module
 2015-05-04 11:36:57 -04:00
Brian Coca
9a216915e9 doc fixes 2015-05-04 11:06:02 -04:00
Brian Coca
3496bac18d Merge pull request #1057 from emonty/feature/os_server_volume 
Add OpenStack Server Volume module
 2015-05-04 10:57:13 -04:00
Brian Coca
0060c47b8c Merge pull request #1058 from emonty/feature/os_subnet 
Add OpenStack Subnet module
 2015-05-04 10:56:25 -04:00
Brian Coca
6ed317df7c Merge pull request #1059 from emonty/feature/os_volume 
Add OpenStack Volume module
 2015-05-04 10:56:08 -04:00
Brian Coca
75319519cc Merge pull request #1182 from sky-shiny/os_validate_fip_network 
Validate openstack floating ip against provided network name.
 2015-05-04 10:48:00 -04:00
Pascal Borreli
f29a6ec54d Fixed typos 2015-05-04 12:54:03 +01:00
Brian Coca
9028e9d4be minor doc fixes, set version added for new tags: parameter 
should Fix #10894
 2015-05-01 09:58:27 -04:00
Toshio Kuratomi
e971543bd4 Merge pull request #1231 from xiaclo/patch-1 
Fix route53 TTL validation
 2015-04-30 20:01:36 -07:00
xiaclo
946af50b22 Update route53.py 2015-05-01 12:28:47 +10:00
Toshio Kuratomi
1fdf75d49d Second try at fixing #1227 -- set e default value earlier 2015-04-30 19:09:22 -07:00
Toshio Kuratomi
e51ea29d8f Return empty list if an image has no repo_tags 2015-04-30 17:44:05 -07:00
Toshio Kuratomi
e356692c74 Get docker's default api version definition from both 1.2 location and pre-1.2 location 
Fixes #1227
 2015-04-30 07:47:44 -07:00
Brian Coca
09aa79c58f Merge pull request #1102 from heiparta/extra_hosts 
Add support for extra_hosts to docker module
 2015-04-30 09:08:18 -04:00
Brian Coca
1fe7da5bea Merge pull request #1180 from sky-shiny/os_multi_region_support 
Adding openstack multiregion support for floating ip module.
 2015-04-30 08:48:29 -04:00
xiaclo
5d1a3ee0ac Fix issue #1156 
Fix as suggested in the issue.

https://github.com/ansible/ansible-modules-core/issues/1156
 2015-04-30 13:01:00 +10:00
Brian Coca
a811b9f12e removed deprecated docs, not true anymore 2015-04-28 16:48:28 -04:00
Toshio Kuratomi
e95c0b2df3 Only split on the first colon. 
Fixes #1214
 2015-04-28 08:33:50 -07:00
zimbatm
34378b6c6a ec2_group: prioritise current VPC group names over others 2015-04-28 10:19:20 +01:00
zimbatm
8a4d5856ce ec2_group: select own group if the name matches 
This fixes an issue where multiple VPC have the same group name and
the one from the other VPC is selected.
 2015-04-27 19:26:13 +01:00
Brian Coca
78de8bbd99 removed unused and undefined aws_regions 2015-04-27 12:38:57 -04:00
Brian Coca
e137aea5d3 Merge pull request #1195 from bcoca/ec2_scaling_policy_fix 
removed redundant region def
 2015-04-27 12:34:59 -04:00
Martin Froehlich
4bcbcc8869 Use get_aws_connection_info to get AWS creds. 
Previously used get_ec2_creds did not consider security_token,
making MFA requests fail.
 2015-04-26 14:50:07 +01:00
Brian Coca
0e23dd6c55 avoid exception when boto is not available 2015-04-24 11:03:36 -04:00
Brian Coca
a905edd536 removed redundant region def 2015-04-24 08:54:56 -04:00
David Shrewsbury
c451fbdd61 Update os_server_volume for latest shade 
The shade volume API was updated to return a dict rather than the
object as returned by cinder.
 2015-04-23 10:52:08 -04:00
David Shrewsbury
f4600edeb8 Update os_volume for latest shade 
The shade volume API was updated to return a dict rather than the
object as returned by cinder.
 2015-04-23 10:37:43 -04:00
Chris Meyers
c66de51b16 better timeout logic when deleting vm disks. Python 2.4 safe excepts 2015-04-22 17:57:37 -04:00
Chris Meyers
797a617a1d correctly delete disks associated with vms 2015-04-22 17:04:35 -04:00
Brian Coca
178d3ea133 minor doc fixes 2015-04-22 16:40:59 -04:00
Brian Coca
b0cf0ae912 Merge pull request #1056 from emonty/feature/os_server_facts 
Add OpenStack Server facts module
 2015-04-22 15:21:40 -04:00
Brian Coca
70e24f1f4d Merge pull request #540 from lander2k2/hosted_service 
azure check for hosted service and vm before creating
 2015-04-22 11:07:29 -04:00
Brian Coca
8ce2a18921 Merge pull request #1184 from bobby/ec2_vpc-without-subnets 
Fixes regression introduced by edf1ac1ea6
 2015-04-21 15:17:44 -04:00
Bobby Calderwood
98a9f2d5b8 Fixes regression introduced by edf1ac1ea6 2015-04-21 14:56:46 -04:00
mcameron
6498303786 Net_id already present, remove unnecessary lookup. 2015-04-21 13:22:04 +01:00
mcameron
cb2ba9fe31 Valodate fip is on the correct network 2015-04-21 13:21:56 +01:00
bw-will-usher
0846de2cd5 Fixed MS SQL port number in documentation (1443->1433) per: https://support.microsoft.com/en-us/kb/287932 2015-04-21 07:59:05 -04:00
mcameron
394152f4ac Adding openstack multiregion support 2015-04-21 11:46:38 +01:00
Brian Coca
7255968f96 Merge pull request #1167 from romain-dartigues/issue1161_digitalocean 
Issue #1161 DigitalOcean API 2 ssh_key_ids problem
 2015-04-20 19:08:04 -04:00
Brian Coca
750ca8f4d3 Merge pull request #1173 from sky-shiny/os_nova_list_addresses 
Os nova list addresses
 2015-04-20 10:33:24 -04:00
Andrey Trubachev
1c8a8e8900 Fix mess of ipv6 and ipv4 addresses in private_ip 2015-04-20 15:28:56 +01:00
Romain Dartigues
3c848289a0 Issue #1161 DigitalOcean API 2 ssh_key_ids problem 
* fix documentation: show a valid syntax
* make ssh_key_ids a list and not a string
 2015-04-19 19:25:15 +02:00
Brian Coca
be89a2f5fc added new ec2_ami_find as per #905 2015-04-16 15:39:26 -04:00
Brian Coca
5e1224c4a8 deprecated ec2_ami_search 2015-04-16 15:39:26 -04:00
sisso
34d6d6f777 fixed bug where scaling policy return a random policy if many autoscale group have policies with same name. 2015-04-16 14:36:26 -03:00
Brian Coca
89bd6af0ed Merge pull request #966 from jnsaff/devel 
Added support for tagging images in ec2_ami.py
 2015-04-16 11:35:37 -04:00
David Shrewsbury
c241296a20 Update os_subnet module for latest shade 
Shade can now handle creating, updating and deleting subnets.
This cleans up the module to take advantage of that.
 2015-04-16 09:19:29 -04:00
David Shrewsbury
b854a28dfb Rename os_subnet to os_subnet.py 2015-04-16 09:17:57 -04:00
Jan Brauer
fcea4e1884 Add missing comma 2015-04-10 19:05:57 -04:00
Daekwon Kim
7684059044 Fix indent of "register" key 2015-04-09 19:10:49 +09:00
Daekwon Kim
88639ae8be Fix typo (volue -> volume) 2015-04-09 19:09:42 +09:00
Brian Coca
3b9756e0cd minor doc fixes 2015-04-08 03:20:28 -04:00
James Martin
b67e1a1ce9 Streamlined rolling udpate algorithm. Still need to account for partials, and not waiting for instances if we're mass terminating them. 2015-04-07 22:16:28 -04:00
David Shrewsbury
4a233a5a8f Recognize when volume attach/detach is not necessary 
Do not attempt to attach an already attached volume.
Likewise, do not attempt to detach a volume that is not
attached.

This version adds support for check mode.
 2015-04-07 14:37:06 -04:00
Heikki Partanen
91ca2d6386 Add support for extra_hosts to docker module 
extra_hosts parameter (maps to --add-host in 'docker run' syntax) is used
to add host-to-ip mappings to the container.
 2015-04-07 10:30:14 +03:00
Kyle Johnson
86ed1cd0a9 Fix typo in rds_subnet_group.py 
aws_connection_kwargs should be aws_connect_kwargs
 2015-04-06 10:00:17 -04:00
Sam Kottler
7e1d63136f Merge pull request #998 from linefeedse/digitalocean-user-data 
DigitalOcean API version 2 with user_data option
 2015-04-05 15:26:54 -04:00
Brian Coca
4d9ce9cf2c Merge pull request #1032 from jder/fix-rds-vpc-groups 
Update rds module for RDS2 parameter name change.
 2015-04-03 20:24:33 -04:00
Matt Martz
1e94fc5ab5 Don't use a dict comprehension, be more verbose 2015-04-03 16:35:16 -05:00
Andrew Davis
f38186ce8b ansible_facts reflects 1.8 output 2015-04-03 12:41:10 -07:00
Brian Coca
c01a18d5ca minor docfixes 2015-04-02 21:07:41 -04:00
Brian Coca
eed47383e4 Merge pull request #1040 from emonty/feature/os_auth 
Add OpenStack Auth module
 2015-04-02 20:51:53 -04:00
Jesse Rusak
030703f4ca Update rds module for RDS2 parameter name change. 
boto's rds2 renamed `vpc_security_groups` to `vpc_security_group_ids`
and changed from a list of `VPCSecurityGroupMembership` to just a
list of ids. This accommodates that change when rds2 is being used.
 2015-04-02 15:32:12 -04:00
Dan Abel
c5f5dfd8a0 use aws connect calls that allow boto profile use 2015-04-02 10:51:18 +01:00
steenzout
d960dc1584 issue #994: use HAS_BOTO to determine if import was successful: 
- removed import of sys module.
- HAS_BOTO constant to check if import was successful.
- trigger a failure when import fails.
- removed unnecessary imports.
 2015-04-01 17:31:10 -06:00
Eric Johnson
07a694647b Merge pull request #1010 from richtier/gc_storage_upload_headers 
gc_storage allow setting headers
 2015-04-01 13:32:22 -07:00
Richard Tier
9aa8879f0f added version to docstring 2015-04-01 21:01:00 +01:00
Monty Taylor
d7e65eab41 Add OpenStack Volume module 2015-03-31 19:42:41 -04:00
Monty Taylor
5d7b6aae04 Add OpenStack Subnet module 
Also deprecated old quantum_subnet module
 2015-03-31 19:42:09 -04:00
Monty Taylor
f6cf1411a1 Add OpenStack Server Volume module 2015-03-31 19:41:44 -04:00
Monty Taylor
cb6ebb1c03 Add OpenStack Server facts module 2015-03-31 19:41:17 -04:00
Monty Taylor
f2c6619826 Add OpenStack Object module 2015-03-31 19:36:24 -04:00
Monty Taylor
c9f1e441f5 Add OpenStack Auth module 
Use this to pre-auth or to get a copy of the service catalog.
 2015-03-31 19:32:05 -04:00
Monty Taylor
4656797389 Add Ironic Node module 2015-03-31 19:30:22 -04:00
Ash Wilson
45b067f097 Record facts for each changed container. 2015-03-31 16:14:16 -04:00
Brian Coca
e6e3ade6fa added support for postgres9.4 which is now available from amazon 2015-03-31 11:46:54 -04:00
Brian Coca
613961c592 really fixed docs this time 2015-03-31 09:15:20 -04:00
Brian Coca
99391f861d fixed doc issues on cloudformation 2015-03-31 09:09:43 -04:00
Ash Wilson
b28459e6f5 Wait for process exit on detached=no. 2015-03-30 15:52:17 -04:00
Rob Johnson
ea1ffc6d19 allow both template and template_url parameters 2015-03-30 15:27:03 +01:00
Brian Coca
d27df0cdb4 Merge pull request #334 from adamchainz/cloudformation_dont_always_need_template 
Make cloudformation module's template argument not required in case of stack deletion
 2015-03-30 08:56:56 -04:00
Brian Coca
1865ddbbdf Merge pull request #339 from lorin/instance_id 
ec2 module: add instance_id alias
 2015-03-30 08:49:07 -04:00
Mick Bass
7de97864be clean rebase of https://github.com/ansible/ansible-modules-core/pull/1024 on a new branch 2015-03-29 21:56:44 -06:00
Brian Coca
8c80900fef removed requirements/boto as it broke documentation as it is duplicated in shared aws fragements 2015-03-29 17:08:08 -04:00
Brian Coca
adfcfa4b58 Merge pull request #318 from preo/ec2-group-empty-rules 
Allow empty EC2 Security Group rules.
 2015-03-29 10:26:33 -04:00
Brian Coca
feb5144c71 Merge pull request #1021 from defionscode/s3_conn 
allow boto profile use with s3
 2015-03-29 10:08:54 -04:00
Adam Chainz
8a4e7e5d9f Make cloudformation module's template argument not required in case of stack deletion 2015-03-29 09:31:13 +01:00
Kohei YOSHIDA
8ab812c242 support secure connection on fakes3 2015-03-28 23:31:53 +09:00
Jonathan Davila
611165a77e allow boto profile use with s3 2015-03-28 10:17:12 -04:00
Lorin Hochstein
ea4d5798c7 Use the correct alias syntax 2015-03-28 09:31:52 -04:00
Lorin Hochstein
e759b4d0eb ec2 module: add instance_id alias 
Create an alias named instance_id for the instance_ids parameter.
 2015-03-28 09:31:52 -04:00
Ryan Trauntvein
5320cc93e6 Specify that "state: reloaded" was added in Ansible 1.9 2015-03-27 16:36:10 -07:00
Scott Miller
13d420ebee describe choices in alias documentation 2015-03-27 16:20:20 -04:00
Brian Coca
f3e4704d92 Merge pull request #569 from 47lining/rate-throttling-retries-update 
add retry with exponential backoff when we receive throttling error code...
 2015-03-27 08:21:09 -04:00
Mick Bass
64a2077787 Add support for AWS Security Token Service (temporary credentials) to all AWS cloud modules. 2015-03-26 22:44:56 -06:00
Richard Tier
04c1927300 allow setting header 2015-03-26 23:02:35 +00:00
Brian Coca
eacf4e4239 Merge pull request #269 from SDFE/rds_subnet_group_params 
use aws connect call in rds_subnet_group that allows boto profile use
 2015-03-26 15:53:33 -04:00
Toshio Kuratomi
7e7eafb3e3 Make lack of boto call fail_json instead of sys.exit 
Fixes #994
 2015-03-26 12:12:39 -07:00
Brian Coca
5d776936cc Merge pull request #256 from SDFE/route53_connect_params 
Use aws connect calls that allow boto profile use
 2015-03-26 14:34:24 -04:00
Brian Coca
68daec05f2 Merge pull request #254 from SDFE/ec2_vpc_connect_params 
use simpler ec2_connect ec2 util call
 2015-03-26 14:17:27 -04:00
Brandon W Maister
efa4d04284 Make cache_subnet_group default to empty security groups 
Since they can't be specified together, it seems like setting the
default to no security groups is the right option.
 2015-03-26 13:56:46 -04:00
Brandon W Maister
3cb2346312 Add cache_subnet_group to elasticache module 
According to the [docs] cache subnet groups are required inside a VPC.

[docs]: http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/CacheSubnetGroups.html
 2015-03-26 13:56:46 -04:00
Brian Coca
0771dd12ca Merge pull request #1004 from bcoca/s3_fixes 
S3 fixes
 2015-03-26 12:39:36 -04:00
Brian Coca
e5ed49d6c7 added patch to workaround some s3 connection faliures 2015-03-26 11:23:32 -04:00
Tor Åke Fransson
360409cee8 Merge remote-tracking branch 'origin/devel' into digitalocean-user-data 
Conflicts:
	cloud/digital_ocean/digital_ocean.py
 2015-03-26 14:05:57 +01:00
Tor Åke Fransson
3f17ec489b Remove all reference to obsolete client_id and rename api_key to the for v2 more correct api_token 2015-03-26 13:56:39 +01:00
Tor Åke Fransson
41875984e5 Make digital_ocean ssh command use API v2 2015-03-26 09:57:35 +01:00
Brian Coca
f6c9d555a0 Merge pull request #976 from jsmartin/asg_doc_fix 
Re-wording of feature.
 2015-03-25 22:12:35 -04:00
Brian Coca
6570d48657 refactrored connection exception handling, added check to see if we actually get a connection before proceeding 
Fixes #964
 2015-03-25 21:40:13 -04:00
Brian Coca
79844506db Merge pull request #341 from axilleas/digitalocean_docs 
digital_ocean: Add note about using API v1
 2015-03-25 15:16:03 -04:00
Tor Åke Fransson
69911ec86e WIP: DigitalOcean API version 2 with user_data option 2015-03-25 16:43:11 +01:00
Toshio Kuratomi
9464277f4f Merge pull request #993 from smashwilson/docker-deployed-by-image 
[docker] Compare container's configured image instead of running image
 2015-03-24 12:55:33 -07:00
Ash Wilson
9ce2fc718a Only fetch details when necessary. 2015-03-24 11:18:15 -04:00
Ash Wilson
47f4c3f2e5 Compare container images to Config.Image. 2015-03-24 11:07:12 -04:00
Sarah Zelechoski
43cd4ebd2e fix syntax in last example 2015-03-24 10:31:34 -04:00
James Martin
3bd2b7c8aa Re-wording of feature. 2015-03-20 14:59:34 -04:00
Toshio Kuratomi
5399f3744f Fix review comments from @bcoca in #745 2015-03-20 09:52:19 -07:00
Toshio Kuratomi
9e9fa6a451 Merge branch 'fix-ec2_asg' of https://github.com/m-o-e/ansible-modules-core into m-o-e-fix-ec2_asg 2015-03-20 09:43:05 -07:00
Toshio Kuratomi
a78de50801 Minor code formatting 2015-03-19 22:38:06 -07:00
Rowan Wookey
37412219d5 Fixed group name not being passed to wait_for_new_instances when replacing instances 
Fixed group_name not being passed to wait_for_elb
Minor code clean up
 2015-03-19 22:38:06 -07:00
James Martin
1c96ff32a1 check lb for instance healthy and some refactoring of rolling replace functions. 
Optionally waiting for new instances to be in viable state on ASG creation/update.

Properly updating properties and terminating group.
 2015-03-19 22:38:06 -07:00
Toshio Kuratomi
fb1c92ffa4 Merge pull request #724 from ferrants/devel-metric_alarm_fix 
check keys is in dim2 before evaluating
 2015-03-19 12:46:43 -07:00
Brian Coca
5641b1ff73 undeprecated openstack modules as new ones are not making into release 2015-03-19 15:15:17 -04:00
moncho
3421712e05 Update docker.py 
Fix typo that prevents use_tls 'encrypt' option from working properly.
 2015-03-19 19:30:36 +01:00
Jaanus Torp
aca893cf43 Added support for tagging images in ec2_ami.py 2015-03-19 15:39:42 +00:00
Eric Johnson
c7381a92b8 Merge pull request #956 from rmarsagoogle/gce_net 
Added multiple allowed ranges.
 2015-03-19 06:09:18 -07:00
Toshio Kuratomi
76198a8223 Merge pull request #961 from nemunaire/fix-docker-version-print 
[docker] Fix formating error when remote host doesn't have required version
 2015-03-18 19:51:45 -07:00
Toshio Kuratomi
e338fef730 Add another valid status from downloading images 2015-03-18 18:27:01 -07:00
nemunaire
fce8c21176 Convert tuple items to string before format 2015-03-18 14:37:26 +01:00
whiter
6c1687e68e Added changed=True flag when new subnet groups created. Added conditional so that modify_db_subnet_group is only called when necessary and changed=True flag will be set. 2015-03-18 14:52:49 +11:00
Robert Marsa
74e94f2712 Added multiple allowed ranges. 2015-03-17 13:49:53 -07:00
Julien Syx
23fdba26b5 Fix the issue #931 
Checking that the parameter doesn't exist. The old code had a bug when the parameter was 0.
 2015-03-17 17:57:18 +01:00
Toshio Kuratomi
8658b82de7 Some code cleanup (removed unused variables and imports) 2015-03-16 11:58:03 -07:00
Toshio Kuratomi
34c4e0d495 Also use DOCKER_TLS_VERIFY env var to turn on tls verification 2015-03-16 11:43:52 -07:00
Toshio Kuratomi
ceda82603a Merge pull request #947 from ansible/docker-tls-none 
When no use_tls is not specified and no tls parameters are given we need to not attempt tls.
 2015-03-16 11:29:14 -07:00
Toshio Kuratomi
b0d194ea94 Fix a potential bug in docker pull 2015-03-15 11:22:07 -07:00
Toshio Kuratomi
d65d04b3f8 Merge pull request #904 from ansible/ec2_vpc-sort 
Sort subnets by the order they are specified in the play
 2015-03-15 11:19:07 -07:00
Toshio Kuratomi
5b4d7a2182 When no use_tls is not specified and no tls parameters are given we need to not attempt tls. 2015-03-14 22:59:17 -07:00
Alex Rowley
7d6cd3baaa cloud/amazon/s3: update documentation 
update description to show that module can do more than just put files into s3
 2015-03-13 21:08:30 +00:00
Toshio Kuratomi
45637176dc Merge branch 'volumes_from' of https://github.com/lorin/ansible-modules-core into lorin-volumes_from 
Remove volumes_from altogether

Conflicts:
	cloud/docker/docker.py
 2015-03-13 13:42:40 -07:00
Toshio Kuratomi
e4a5b46cfb Merge pull request #936 from ansible/docker-pid-mode 
Make pid_mode parameter do minimum docker-py/docker server version checks
 2015-03-13 11:50:46 -07:00
Toshio Kuratomi
81fc92bd66 Make state=running work for backwards compatibility with 1.8 2015-03-13 10:23:10 -07:00
Toshio Kuratomi
bddd02bfcb Fix lookup of parameter name to be pid instead of pid_mode 2015-03-13 07:31:55 -07:00
Toshio Kuratomi
9d0d54b9a6 Merge pull request #926 from ansible/docker-tls-alt-854 
Alternative implementation of tls for docker
 2015-03-12 23:41:28 -07:00
Toshio Kuratomi
cf9374f3ea Make pid_mode parameter do minimum docker-py/docker server version checks 2015-03-12 22:53:31 -07:00
Toshio Kuratomi
3a6cc86578 Fix for problems found by @dguerri 
* TLSConfig['verify'] has to be set to False if we're only encrypting the
  connection, not verifying the host.
* tls_hostname was not set if tls_ca_cert was not present

https://github.com/ansible/ansible-modules-core/pull/926#issuecomment-78573877
 2015-03-12 12:53:48 -07:00
Toshio Kuratomi
1add8ed9e5 Implement comments from @smashwilson: 
* if tls_ca_cert is set then use tls to verify the server
* take tls_hostname from the environment variable DOCKER_TLS_HOSTNAME
  if it's not specified in the playbook

https://github.com/ansible/ansible-modules-core/pull/926#issuecomment-78542210
 2015-03-12 11:07:22 -07:00
Stefan Junker
c3f92cca21 docker: Use a list instead of a dict for volumes according to the docker-py docs. Do not add host-binds to volumes list. 2015-03-12 12:55:14 +01:00
Stefan Junker
d8df5da49f merge and resolve conflict in docker.py 2015-03-12 12:47:54 +01:00
Ian Babrou
763f472f5b fixed: global name 'e' is not defined 2015-03-12 11:04:50 +03:00
Toshio Kuratomi
3e0cbc82f1 Alternative implementation of tls for docker 
Alternative to #854
 2015-03-11 20:37:27 -07:00
Toshio Kuratomi
31cc5f543f Fix for py2.6 (no dict comprehensions on py2.6) 2015-03-11 19:07:55 -07:00
Toshio Kuratomi
8ed415589a Initialize the value of vpc_id variable 2015-03-11 18:40:05 -07:00
Brian Coca
07d5b50e2c Merge pull request #903 from h3biomed/allow_default_subnet 
Allow vpc_subnet_id to remain unspecified (see bc0c169)
 2015-03-11 14:46:59 -04:00
Brian Coca
df835f8be9 Merge pull request #924 from hkariti/route53_public_zones 
Fix KeyError in public zones in route53
 2015-03-11 13:57:33 -04:00
Toshio Kuratomi
974075277d Also don't fail if files are different and overwrite is false for uploads (this mimics copy and template). 
Related to #489
 2015-03-11 08:59:38 -07:00
Hagai Kariti
d65f9aa3af Fix KeyError in public zones in route53 2015-03-11 17:30:20 +02:00
Toshio Kuratomi
ca32205c7b Documentation style changes 2015-03-11 08:26:16 -07:00
Toshio Kuratomi
47c6dae9f3 Merge pull request #490 from pgehres/devel 
Issue #489: s3 should not fail on checksum mismtach when overwrite=no
 2015-03-11 08:22:23 -07:00
Matt Martz
a4e65e8e6e Prevent an empty error message 2015-03-10 11:30:14 -05:00
Ian Babrou
9ecfde7551 not triggering reload for links and not string env variables 2015-03-09 22:49:00 +03:00
Ash Wilson
0969fd75c8 Use {0}, {1} style format indices for 2.6 compat 2015-03-09 12:54:22 -04:00
Ash Wilson
19664a96db Expect module env vars to override Dockerfile ones. 2015-03-09 12:17:39 -04:00
Ash Wilson
608ddbea29 Include bind mounts in VOLUMES check. 2015-03-09 11:20:14 -04:00
Ash Wilson
2c58eb3845 Exposed ports, env vars, volumes from the image. 
This will account for settings that are provided by the hierarchy of
Dockerfiles used to construct your image, rather than only accounting
for settings provided to the module directly.
 2015-03-09 10:32:10 -04:00
Ash Wilson
79db475316 Full image inspection and just repo tags 
Hat tip to @bobrik.
 2015-03-09 10:05:56 -04:00
Brian Coca
1c0623ab8d Merge pull request #890 from SamYaple/docker-pid-support 
Add pid mode support to docker module
 2015-03-07 20:27:42 -05:00
Ash Wilson
d046425049 Connect to Docker with optional TLS. 2015-03-06 18:04:36 -05:00
Ash Wilson
80aca4b936 Rework docker module states. 
Organize each state into a distinct function for readability and composability.
Rework `present` to create but not start containers. Add a `restarted` state
to unconditionally restart a container and a `reloaded` state to restart a
container if and only if its configuration is incorrect. Store our most recent
knowledge about container states in a ContainerSet object. Improve the value
registered by this task to include not only the inspect data from any changed
containers, but also action counters in their native form, a summary message
for all actions taken, and a `reload_reasons` key to store a human-readable
diagnostic to determine why each container was reloaded.
 2015-03-06 17:58:11 -05:00
Ash Wilson
7490223940 Pull newer image versions when requested. 2015-03-06 17:56:45 -05:00
Ash Wilson
fedbea682e Another documentation commit. 2015-03-06 17:56:37 -05:00
Toshio Kuratomi
edf1ac1ea6 Sort subnets by the order they are specified in the play 
Fixes #172
 2015-03-06 14:55:11 -08:00
Bret Martin
f16d8d9afb Allow vpc_subnet_id to remain unspecified (see bc0c169) 2015-03-06 14:59:27 -05:00
Sam Yaple
e1e74bdf33 Updated version and fixed default 2015-03-06 03:13:55 -06:00
Lev Popov
a15cce2d7f Allow to keep instance boot disk after instance deletion in google cloud module 2015-03-04 09:41:03 +01:00
Sam Yaple
74e922449b Add pid mode support to docker module 
This allows setting the pid namespace for a container. Currently only
the 'host' pid namespace is supported.

This requires Docker 1.4.1 and docker-py 1.0.0
 2015-03-03 23:32:15 -06:00
Eric Johnson
bd8cfa2a24 Merge pull request #883 from nabam/gcloud-external-ip 
Allow to spawn instances without external ip in google cloud module
 2015-03-03 15:59:59 -08:00
Jonathan Davila
19e7e99470 iam_policy 2015-03-03 15:23:06 -05:00
Toshio Kuratomi
9f38f6e6a2 Small code cleanup 2015-03-03 12:07:42 -08:00
Brandon W Maister
7f5aea980a ec2: Apply all security groups at instance-creation 
The code was picking out the first instance from the security groups
specified, even when multiple groups were specified. Now we use all of
them.
 2015-03-03 13:03:08 -05:00
Lev Popov
94c1b55744 Allow to spawn instances without external ip in google cloud module 2015-03-03 15:29:47 +01:00
Brian Coca
72b49f4c71 Merge pull request #846 from mlaccetti/devel 
Change s3 to use connect_to_region
 2015-03-03 08:51:35 -05:00
Michael Laccetti
5e7605475d Moving the import to the top of the file and getting rid of the redundancy 
I sure do wish I knew where the whitespace change was coming from, though. Frustrating.
 2015-03-02 20:12:54 -05:00
Feanil Patel
4a195c64f1 Compare DNS names case insensitively. 2015-03-02 10:59:14 -05:00
Trevor Pounds
07d562c58a Instance deregistration should try all associated ELBs. Fixes #869 2015-02-27 14:55:50 -08:00
James Cammarata
05904a7e17 Merge branch 'devel' of https://github.com/ansible/ansible-modules-core into devel 2015-02-27 11:01:46 -06:00
James Cammarata
db38d31f02 Updating version added fields for new alias parameters in route53 2015-02-27 11:00:21 -06:00
James Cammarata
49a493662a Merge branch 'route53-alias' of https://github.com/Coderah/ansible-modules-core into Coderah-route53-alias 2015-02-27 09:50:00 -06:00
James Cammarata
0c53b9033c Merge pull request #747 from barraponto/ec2_instance_info 
Add ec2 instance tags and groups info
 2015-02-27 09:41:08 -06:00
Monty Taylor
2e4091f31d One more OpenStack deprecation notice 
Fixes #858
 2015-02-27 07:05:03 -05:00
James Cammarata
fafb93490c Add private_zone parameter for route53 
Fixes #473
 2015-02-26 21:35:47 -06:00
Monty Taylor
cae8241ea7 Add deprecation notices for old OpenStack modules 2015-02-26 21:12:27 -05:00
Monty Taylor
dd4a6e86bd Deprecate old OpenStack modules 
There are a completely new set of modules that do all of the things like
keystone v3 and auth_plugins and the like correctly. Structurally
upgrading these would have been massively disruptive and there is no
real good way to do so without breaking people.

These modules should be kept around for several releases - they still
work for people - and they should get bug fixes. But they should not
take new features. New features should go to the os_ modules.
 2015-02-26 10:00:49 -05:00
Brian Coca
ec755796c0 Merge pull request #827 from bcoca/ec2_ami_handle_exceptions 
now captures connection exceptions and returns in 'nicer' module failure
 2015-02-25 10:37:43 -05:00
Michael Laccetti
60e2e43f00 Change s3 to use connect_to_region 
* Allows us to use Ansible/s3 for GovCloud when accessing a pre-existing bucket
 2015-02-25 08:46:13 -05:00
Brian Coca
d2158708ff undeprecated docker_image until replacement actually arives 2015-02-23 12:43:10 -05:00
Toshio Kuratomi
c88259077e Merge pull request #698 from joelthompson/devel 
ec2_group with purge_rules will purge too many rules.
 2015-02-21 06:42:20 -08:00
Jens Carl
80da041eb6 - List the name servers of a zone. 2015-02-20 17:22:03 +00:00
Brian Coca
af31cb8faf now captures connection exceptions and returns in 'nicer' module failure 2015-02-20 09:28:11 -05:00
Jorge-Rodriguez
57f0d22482 Added optional parameter scheduler_hints. 2015-02-20 12:51:18 +02:00
Bret Martin
bc0c1692b5 ec2: make group only match group names in this VPC 2015-02-19 11:28:13 -05:00
Edward
3fbfd7351b Fixes #816 Backups not enabled on new droplets. 
Convert backups_enabled string to lowercase. Similar to fix for private
networking.
 2015-02-18 21:23:11 -05:00
Brian Coca
b787792908 Merge pull request #679 from marqc/fix_dns_create_container_issue 
Fixes docker.errors.DockerException: 'dns' parameter has no effect on create_container()...
 2015-02-18 15:44:16 -05:00
Brian Coca
53ef859ae4 fix instance=None documentation 2015-02-18 13:32:50 -05:00
Brian Coca
77241123a7 Revert "Revert "Don't use 'tenancy' in ec2 spot requests"" 2015-02-18 11:07:13 -05:00
Brian Coca
7c42182f47 Revert "Don't use 'tenancy' in ec2 spot requests" 2015-02-18 08:59:26 -05:00
Matt Martz
5824f78773 Merge pull request #798 from sivel/rax-boot-vol-v2 
rax: add boot from volume support
 2015-02-17 12:31:32 -06:00
Brian Coca
7e71121da5 Merge pull request #730 from SergeyZh/devel 
Fixed broken volumes_from for client API >= 1.10
 2015-02-17 11:49:16 -05:00
Matt Martz
3dbf65f63c DRY up duplicate code 2015-02-17 10:45:29 -06:00