summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2017-09-06 15:55:06 -0700
committerTim Smith <tsmith@chef.io>2017-09-06 15:55:06 -0700
commitaf879ff8d05de6f755ffa36251dd71335840a5bc (patch)
treece4e6705897a473d25f75201fea0a1d5cd03e43b
parent75bfcfb21bfb4ec9a9166647cef9bed532f465fe (diff)
downloadohai-af879ff8d05de6f755ffa36251dd71335840a5bc.tar.gz
Move the queries into the actual plugin
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--lib/ohai/plugins/ec2.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ohai/plugins/ec2.rb b/lib/ohai/plugins/ec2.rb
index f0e0f5eb..3c085920 100644
--- a/lib/ohai/plugins/ec2.rb
+++ b/lib/ohai/plugins/ec2.rb
@@ -24,11 +24,11 @@
# 3. DMI data mentions amazon. This catches HVM instances in a VPC
# 4. Kernel data mentioned Amazon. This catches Windows HVM & paravirt instances
-require "ohai/mixin/ec2_metadata"
-require "ohai/mixin/http_helper"
-require "base64"
-
Ohai.plugin(:EC2) do
+ require "ohai/mixin/ec2_metadata"
+ require "ohai/mixin/http_helper"
+ require "base64"
+
include Ohai::Mixin::Ec2Metadata
include Ohai::Mixin::HttpHelper