openstack/puppet-keystone
Code Issues Proposed changes

Keystone user issues on Puppet Enterprise.

Browse Source 
Puppet Enterprise doesn't work for:
 - keystone_user;
 - keystone_tenant;
 - keystone_user_role;

    Error: Could not retrieve catalog from remote server: Error 400 on SERVER: Could not autoload puppet/type/keystone_user: Malformed version number string 3.8.1 (Puppet Enterprise 3.8.1)

This is due to the modified version string that Puppet Enterprise uses.
This patch takes this string into consideration.  It has been tested
successfully on Puppet Enterprise.

Change-Id: I8c79b9331134762620509ca0a6c09e16e534ad9b
Closes-Bug: #1516687
This commit is contained in:
Sofer Athlan-Guyot 2015-11-16 17:40:05 +01:00
parent 0f7c194f01
commit d3f03c6732
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/puppet_x/keystone/composite_namevar.rb
View File

@ -1,5 +1,5 @@
# Cherry pick PUP-1073 from puppetlabs: support of composite namevar for alias.
if Gem::Version.new(Puppet.version) < Gem::Version.new('4.0.0')
if Gem::Version.new(Puppet.version.sub(/\(Puppet Enterprise .*/i, '').strip) < Gem::Version.new('4.0.0')
Puppet::Resource::Catalog.class_eval do
def create_resource_aliases(resource)
# Skip creating aliases and checking collisions for non-isomorphic resources.