← Back to branch summary

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

« back to all changes in this revision

Viewing changes to library/cloud/s3

  • 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/s3
258
258
            mode           = dict(choices=['get', 'put', 'delete', 'create', 'geturl', 'getstr'], required=True),
259
259
            expiry         = dict(default=600, aliases=['expiration']),
260
260
            s3_url         = dict(aliases=['S3_URL']),
261
 
            aws_secret_key  = dict(aliases=['ec2_secret_key', 'secret_key'], no_log=True, required=False),
262
 
            aws_access_key  = dict(aliases=['ec2_access_key', 'access_key'], required=False),
 
261
            ec2_secret_key = dict(aliases=['aws_secret_key', 'secret_key'], no_log=True),
 
262
            ec2_access_key = dict(aliases=['aws_access_key', 'access_key']),
263
263
            overwrite      = dict(aliases=['force'], default=True, type='bool'),
264
264
        ),
265
265
    )