Description: This reverts fixes for path
 This patch reverst this one:
  https://review.opendev.org/c/openstack/puppet-keystone/+/929304
 .
 This was producing:
  Error: Could not retrieve catalog from remote server: Error 500 on SERVER:
  Server Error: Evaluation Error: Error while evaluating a Resource Statement,
  Evaluation Error: Error while evaluating a Function Call, Could not autoload
  puppet/type/keystone_user: no such file to load --
  puppet/provider/keystone/util (file:
  /usr/share/puppet/modules/heat/manifests/keystone/domain.pp, line: 58,
  column: 5) on node <redacted-hostname>
Author: Thomas Goirand <zigo@debian.org>
Origin: upstream, https://review.opendev.org/c/openstack/puppet-keystone/+/929304
Last-Update: 2024-10-10

--- puppet-module-keystone-25.0.0.orig/lib/puppet/type/keystone_domain.rb
+++ puppet-module-keystone-25.0.0/lib/puppet/type/keystone_domain.rb
@@ -1,3 +1,7 @@
+# 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
 
   desc <<-EOT
--- puppet-module-keystone-25.0.0.orig/lib/puppet/type/keystone_endpoint.rb
+++ puppet-module-keystone-25.0.0/lib/puppet/type/keystone_endpoint.rb
@@ -1,3 +1,6 @@
+# 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/type'
 
--- puppet-module-keystone-25.0.0.orig/lib/puppet/type/keystone_identity_provider.rb
+++ puppet-module-keystone-25.0.0/lib/puppet/type/keystone_identity_provider.rb
@@ -1,3 +1,7 @@
+# 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'
 
 Puppet::Type.newtype(:keystone_identity_provider) do
--- puppet-module-keystone-25.0.0.orig/lib/puppet/type/keystone_implied_role.rb
+++ puppet-module-keystone-25.0.0/lib/puppet/type/keystone_implied_role.rb
@@ -1,3 +1,7 @@
+# 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
 
   desc <<-EOT
--- puppet-module-keystone-25.0.0.orig/lib/puppet/type/keystone_role.rb
+++ puppet-module-keystone-25.0.0/lib/puppet/type/keystone_role.rb
@@ -1,3 +1,7 @@
+# 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
 
   desc <<-EOT
--- puppet-module-keystone-25.0.0.orig/lib/puppet/type/keystone_service.rb
+++ puppet-module-keystone-25.0.0/lib/puppet/type/keystone_service.rb
@@ -1,3 +1,6 @@
+# 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/type'
 
--- puppet-module-keystone-25.0.0.orig/lib/puppet/type/keystone_tenant.rb
+++ puppet-module-keystone-25.0.0/lib/puppet/type/keystone_tenant.rb
@@ -1,3 +1,6 @@
+# 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_x/keystone/composite_namevar'
 require 'puppet_x/keystone/type'
--- puppet-module-keystone-25.0.0.orig/lib/puppet/type/keystone_user.rb
+++ puppet-module-keystone-25.0.0/lib/puppet/type/keystone_user.rb
@@ -1,3 +1,7 @@
+# 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_x/keystone/composite_namevar'
 require 'puppet_x/keystone/type'
--- puppet-module-keystone-25.0.0.orig/lib/puppet/type/keystone_user_role.rb
+++ puppet-module-keystone-25.0.0/lib/puppet/type/keystone_user_role.rb
@@ -1,3 +1,7 @@
+# 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_x/keystone/composite_namevar'
 require 'puppet_x/keystone/type'