From 0f9084c5677d05d4eba963fd388634fd0f8d62ae Mon Sep 17 00:00:00 2001 From: Jaume Devesa Date: Sat, 8 Aug 2015 09:50:48 +0200 Subject: [PATCH] Load 'json' gem even on 1.9.3 I've found problems running JSON on Ubuntu 14.04 even it seems like for ruby 1.9.3 JSON class should be loaded by default. Better meake sure it is loaded by forcing `require 'json'` in the begging of the providers. Change-Id: Ia01822b30d0a8a9f391fcd4f56b76bb7ce039258 --- .../provider/midonet_gateway/midonet_api_caller.rb | 8 ++++---- .../provider/midonet_host_registry/midonet_api_caller.rb | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/lib/puppet/provider/midonet_gateway/midonet_api_caller.rb b/lib/puppet/provider/midonet_gateway/midonet_api_caller.rb index 40dcfb0..1a0abee 100644 --- a/lib/puppet/provider/midonet_gateway/midonet_api_caller.rb +++ b/lib/puppet/provider/midonet_gateway/midonet_api_caller.rb @@ -1,11 +1,11 @@ -require 'uri' -require 'faraday' - if RUBY_VERSION == '1.8.7' require 'rubygems' - require 'json' end +require 'uri' +require 'faraday' +require 'json' + Puppet::Type.type(:midonet_gateway).provide(:midonet_api_caller) do def create diff --git a/lib/puppet/provider/midonet_host_registry/midonet_api_caller.rb b/lib/puppet/provider/midonet_host_registry/midonet_api_caller.rb index dd3ac5f..04ad489 100644 --- a/lib/puppet/provider/midonet_host_registry/midonet_api_caller.rb +++ b/lib/puppet/provider/midonet_host_registry/midonet_api_caller.rb @@ -1,12 +1,11 @@ -require 'uri' -require 'faraday' -# Host registry type - if RUBY_VERSION == '1.8.7' require 'rubygems' - require 'json' end +require 'uri' +require 'faraday' +require 'json' + Puppet::Type.type(:midonet_host_registry).provide(:midonet_api_caller) do def create