summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2017-04-27 07:02:27 -0700
committerTim Smith <tsmith@chef.io>2017-05-08 12:35:16 -0700
commite6f91ac584344bb0c70c3b5768825b253d7967e2 (patch)
tree124a085b1800b407f3277893a845d4c1c9a16dbe
parent3bfa5410ffc61b1bfc4e8846981ad6c1251b61c1 (diff)
downloadohai-e6f91ac584344bb0c70c3b5768825b253d7967e2.tar.gz
Merge pull request #992 from chef/new_ec2_metadata
Add support for the 2016 EC2 metadata releases
-rw-r--r--lib/ohai/mixin/ec2_metadata.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ohai/mixin/ec2_metadata.rb b/lib/ohai/mixin/ec2_metadata.rb
index 1797105d..0a320f3e 100644
--- a/lib/ohai/mixin/ec2_metadata.rb
+++ b/lib/ohai/mixin/ec2_metadata.rb
@@ -2,7 +2,7 @@
# Author:: Tim Dysinger (<tim@dysinger.net>)
# Author:: Benjamin Black (<bb@chef.io>)
# Author:: Christopher Brown (<cb@chef.io>)
-# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
+# Copyright:: 2009-2017 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +43,7 @@ module Ohai
EC2_METADATA_ADDR = "169.254.169.254" unless defined?(EC2_METADATA_ADDR)
EC2_SUPPORTED_VERSIONS = %w{ 1.0 2007-01-19 2007-03-01 2007-08-29 2007-10-10 2007-12-15
2008-02-01 2008-09-01 2009-04-04 2011-01-01 2011-05-01 2012-01-12
- 2014-11-05 2014-02-25 }
+ 2014-11-05 2014-02-25 2016-04-19 2016-06-30 2016-09-02}
EC2_ARRAY_VALUES = %w{security-groups}
EC2_ARRAY_DIR = %w{network/interfaces/macs}