openstack
/
puppet-keystone
Code Issues Proposed changes

Merge "Keystone user issues on Puppet Enterprise."

This commit is contained in:
Jenkins 2015-11-19 16:33:01 +00:00 committed by Gerrit Code Review
parent 96bb9179c9 d3f03c6732
commit dc8a07df41
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.