openstack
/
puppet-keystone
Code Issues Proposed changes

Fixed require statements for puppet 4 

This change updates the require statements in the providers
to resolve the issues with the autoloader in puppet. This
issue technically always existed but was masked prior to the
split with puppet server and puppet agent because both used to
share the same loadpath. Documentation on this issue can be
read at https://tickets.puppetlabs.com/browse/PUP-4450.

Change-Id: I5eae546d65832a39dd75ab9c0f97868c7edc9e91
This commit is contained in:
Matthew J Black 2016-05-16 12:18:23 -04:00
parent 4e386acb4e
commit 6f9d029206
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/puppet/provider/keystone.rb
View File

@ -2,7 +2,7 @@ require 'puppet/util/inifile'
require 'puppet/provider/openstack'
require 'puppet/provider/openstack/auth'
require 'puppet/provider/openstack/credentials'
require 'puppet/provider/keystone/util'
require File.join(File.dirname(__FILE__), '..','..', 'puppet/provider/keystone/util')
class Puppet::Provider::Keystone < Puppet::Provider::Openstack

2
lib/puppet/provider/keystone_domain/openstack.rb
View File

@ -1,4 +1,4 @@
require 'puppet/provider/keystone'
require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/keystone')
require 'puppet/util/inifile'
Puppet::Type.type(:keystone_domain).provide(

2
lib/puppet/provider/keystone_endpoint/openstack.rb
View File

@ -1,4 +1,4 @@
require 'puppet/provider/keystone'
require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/keystone')
Puppet::Type.type(:keystone_endpoint).provide(
:openstack,

2
lib/puppet/provider/keystone_identity_provider/openstack.rb
View File

@ -1,5 +1,5 @@
require 'json'
require 'puppet/provider/keystone'
require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/keystone')
class Puppet::Error::OpenstackDuplicateRemoteId < Puppet::Error; end

2
lib/puppet/provider/keystone_role/openstack.rb
View File

@ -1,4 +1,4 @@
require 'puppet/provider/keystone'
require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/keystone')
Puppet::Type.type(:keystone_role).provide(
:openstack,

2
lib/puppet/provider/keystone_service/openstack.rb
View File

@ -1,4 +1,4 @@
require 'puppet/provider/keystone'
require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/keystone')
Puppet::Type.type(:keystone_service).provide(
:openstack,

2
lib/puppet/provider/keystone_tenant/openstack.rb
View File

@ -1,4 +1,4 @@
require 'puppet/provider/keystone'
require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/keystone')
Puppet::Type.type(:keystone_tenant).provide(
:openstack,

2
lib/puppet/provider/keystone_user/openstack.rb
View File

@ -1,4 +1,4 @@
require 'puppet/provider/keystone'
require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/keystone')
Puppet::Type.type(:keystone_user).provide(
:openstack,

6
lib/puppet/provider/keystone_user_role/openstack.rb
View File

@ -1,6 +1,6 @@
require 'puppet/provider/keystone'
require 'puppet/provider/keystone/util'
require 'puppet_x/keystone/composite_namevar'
require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/keystone')
require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/keystone/util')
require File.join(File.dirname(__FILE__), '..','..','..', 'puppet_x/keystone/composite_namevar')
Puppet::Type.type(:keystone_user_role).provide(
:openstack,