Merge pull request #263 from aharden/aharden-patch-1

Add support and doc for configuration file

README.md

@@ -110,6 +110,15 @@ setting for all traffic like so:
 export PUPPET_AWS_PROXY=http://localhost:8888
 ~~~
 
+#### Using a configuration file
+
+The AWS region and HTTP proxy can be provided in a file called 
+`puppetlabs_aws_configuration.ini` in the Puppet confdir 
+(`$settings::confdir`) using this format:
+
+    [default]
+      region = us-east-1
+      http_proxy = http://proxy.example.com:80
 
 ##Getting Started with aws
 

lib/puppet_x/puppetlabs/aws.rb

@@ -84,7 +84,7 @@ def self.global_credentials
       def self.global_configuration
         Puppet.initialize_settings unless Puppet[:confdir]
         path = File.join(Puppet[:confdir], 'puppetlabs_aws_configuration.ini')
-        File.exists?(path) ? parse_ini(File.new(path)) : nil
+        File.exists?(path) ? ini_parse(File.new(path)) : nil
       end
 
       def self.region_from_global_configuration