summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/ohai/plugins/timezone.rb5
-rw-r--r--spec/unit/plugins/timezone_spec.rb2
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/ohai/plugins/timezone.rb b/lib/ohai/plugins/timezone.rb
index fb35987d..26a63e42 100644
--- a/lib/ohai/plugins/timezone.rb
+++ b/lib/ohai/plugins/timezone.rb
@@ -15,9 +15,10 @@
# limitations under the License.
Ohai.plugin(:Timezone) do
- provides "timezone"
+ provides "time/timezone"
collect_data(:default) do
- timezone Time.now.getlocal.zone
+ time Mash.new unless time
+ time[:timezone] = Time.now.getlocal.zone
end
end
diff --git a/spec/unit/plugins/timezone_spec.rb b/spec/unit/plugins/timezone_spec.rb
index 770dc838..62fcb0ef 100644
--- a/spec/unit/plugins/timezone_spec.rb
+++ b/spec/unit/plugins/timezone_spec.rb
@@ -25,6 +25,6 @@ describe Ohai::System, "timezone plugin" do
it "should get the local timezone" do
@plugin.run
- expect(@plugin["timezone"]).to eq("ZZZ")
+ expect(@plugin["time"]["timezone"]).to eq("ZZZ")
end
end