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

1644 commits

Author SHA1 Message Date
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
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
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
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
Feanil Patel
77ca3c1148 Output the Internet Gatewoy id directly instead of in a dict. 2015-05-15 09:40:30 -04: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
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
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
Rob Johnson
ea1ffc6d19 allow both template and template_url parameters 2015-03-30 15:27:03 +01:00