allow s3file to use ec2 keys#7

lindenle wants to merge 2 commits into

branan:masterbranan/puppet-module-s3file:masterfrom

lindenle:masterlindenle/puppet-module-s3file:masterCopy head branch name to clipboard