Merge "Drop workaround for unit tests"
This commit is contained in:
		@@ -1,7 +1,3 @@
 | 
				
			|||||||
# LP#1408531
 | 
					 | 
				
			||||||
File.expand_path('../..', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
 | 
					 | 
				
			||||||
File.expand_path('../../../../openstacklib/lib', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
Puppet::Type.newtype(:keystone_domain) do
 | 
					Puppet::Type.newtype(:keystone_domain) do
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  desc <<-EOT
 | 
					  desc <<-EOT
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,3 @@
 | 
				
			|||||||
# LP#1408531
 | 
					 | 
				
			||||||
File.expand_path('../..', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
 | 
					 | 
				
			||||||
File.expand_path('../../../../openstacklib/lib', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
 | 
					 | 
				
			||||||
require 'puppet_x/keystone/composite_namevar'
 | 
					require 'puppet_x/keystone/composite_namevar'
 | 
				
			||||||
require 'puppet_x/keystone/type'
 | 
					require 'puppet_x/keystone/type'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,3 @@
 | 
				
			|||||||
# LP#1408531
 | 
					 | 
				
			||||||
File.expand_path('../..', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
 | 
					 | 
				
			||||||
File.expand_path('../../../../openstacklib/lib', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
require 'puppet/provider/keystone/util'
 | 
					require 'puppet/provider/keystone/util'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Puppet::Type.newtype(:keystone_identity_provider) do
 | 
					Puppet::Type.newtype(:keystone_identity_provider) do
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,3 @@
 | 
				
			|||||||
# LP#1408531
 | 
					 | 
				
			||||||
File.expand_path('../..', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
 | 
					 | 
				
			||||||
File.expand_path('../../../../openstacklib/lib', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
Puppet::Type.newtype(:keystone_implied_role) do
 | 
					Puppet::Type.newtype(:keystone_implied_role) do
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  desc <<-EOT
 | 
					  desc <<-EOT
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,3 @@
 | 
				
			|||||||
# LP#1408531
 | 
					 | 
				
			||||||
File.expand_path('../..', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
 | 
					 | 
				
			||||||
File.expand_path('../../../../openstacklib/lib', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
Puppet::Type.newtype(:keystone_role) do
 | 
					Puppet::Type.newtype(:keystone_role) do
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  desc <<-EOT
 | 
					  desc <<-EOT
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,3 @@
 | 
				
			|||||||
# LP#1408531
 | 
					 | 
				
			||||||
File.expand_path('../..', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
 | 
					 | 
				
			||||||
File.expand_path('../../../../openstacklib/lib', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
 | 
					 | 
				
			||||||
require 'puppet_x/keystone/composite_namevar'
 | 
					require 'puppet_x/keystone/composite_namevar'
 | 
				
			||||||
require 'puppet_x/keystone/type'
 | 
					require 'puppet_x/keystone/type'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,3 @@
 | 
				
			|||||||
# LP#1408531
 | 
					 | 
				
			||||||
File.expand_path('../..', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
 | 
					 | 
				
			||||||
File.expand_path('../../../../openstacklib/lib', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
 | 
					 | 
				
			||||||
require 'puppet/provider/keystone/util'
 | 
					require 'puppet/provider/keystone/util'
 | 
				
			||||||
require 'puppet_x/keystone/composite_namevar'
 | 
					require 'puppet_x/keystone/composite_namevar'
 | 
				
			||||||
require 'puppet_x/keystone/type'
 | 
					require 'puppet_x/keystone/type'
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,3 @@
 | 
				
			|||||||
# LP#1408531
 | 
					 | 
				
			||||||
File.expand_path('../..', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
 | 
					 | 
				
			||||||
File.expand_path('../../../../openstacklib/lib', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
require 'puppet/provider/keystone/util'
 | 
					require 'puppet/provider/keystone/util'
 | 
				
			||||||
require 'puppet_x/keystone/composite_namevar'
 | 
					require 'puppet_x/keystone/composite_namevar'
 | 
				
			||||||
require 'puppet_x/keystone/type'
 | 
					require 'puppet_x/keystone/type'
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,3 @@
 | 
				
			|||||||
# LP#1408531
 | 
					 | 
				
			||||||
File.expand_path('../..', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
 | 
					 | 
				
			||||||
File.expand_path('../../../../openstacklib/lib', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
require 'puppet/provider/keystone/util'
 | 
					require 'puppet/provider/keystone/util'
 | 
				
			||||||
require 'puppet_x/keystone/composite_namevar'
 | 
					require 'puppet_x/keystone/composite_namevar'
 | 
				
			||||||
require 'puppet_x/keystone/type'
 | 
					require 'puppet_x/keystone/type'
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user