← Back to branch summary

~canonical-ci-engineering/ubuntu-ci-services-itself/ansible

« back to all changes in this revision

Viewing changes to library/cloud/ec2_ami

  • Committer: Package Import Robot
  • Author(s): Michael Vogt
  • Date: 2013-12-03 08:17:05 UTC
  • mto: This revision was merged to the branch mainline in revision 6.
  • Revision ID: package-import@ubuntu.com-20131203081705-q0t7wlepvpcbiidu
Tags: upstream-1.4.1+dfsg
Import upstream version 1.4.1+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
library/cloud/ec2_ami
264
264
    module = AnsibleModule(
265
265
        argument_spec = dict(
266
266
            ec2_url = dict(),
267
 
            aws_secret_key = dict(aliases=['ec2_secret_key', 'secret_key'], no_log=True),
268
 
            aws_access_key = dict(aliases=['ec2_access_key', 'access_key']),
 
267
            ec2_secret_key = dict(aliases=['aws_secret_key', 'secret_key'], no_log=True),
 
268
            ec2_access_key = dict(aliases=['aws_access_key', 'access_key']),
269
269
            instance_id = dict(),
270
270
            image_id = dict(),
271
271
            delete_snapshot = dict(),