openstack
/
puppet-keystone
Code Issues Proposed changes

Merge "keystone_endpoint: Fix id generate with only partial types"

This commit is contained in:
Zuul 2024-02-22 15:27:23 +00:00 committed by Gerrit Code Review
parent cdef36e88f 96cb8d7744
commit f83e6bc6d2
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -207,7 +207,8 @@ Puppet::Type.type(:keystone_endpoint).provide(
id_str = '' id_str = ''
id_sep = '' id_sep = ''
[:admin, :internal, :public].each do |type| [:admin, :internal, :public].each do |type|
id_str += "#{id_sep}#{endpoint[type][:id]}" if endpoint[type] id_str += id_sep
id_str += endpoint[type][:id] if endpoint[type]
id_sep = ',' id_sep = ','
end end
id_str id_str

27
spec/unit/provider/keystone_endpoint/openstack_spec.rb
View File

@ -132,15 +132,12 @@ region="region"
"endpoint10_id","RegionFour","keystone","identity",True,"admin","http://Four-127.0.0.1:5002" "endpoint10_id","RegionFour","keystone","identity",True,"admin","http://Four-127.0.0.1:5002"
"endpoint11_id","RegionFour","keystone","identity",True,"internal","https://Four-127.0.0.1:5001" "endpoint11_id","RegionFour","keystone","identity",True,"internal","https://Four-127.0.0.1:5001"
"endpoint12_id","RegionFour","keystone","identity",True,"public","https://Four-127.0.0.1:5000" "endpoint12_id","RegionFour","keystone","identity",True,"public","https://Four-127.0.0.1:5000"
"endpoint13_id","RegionFive","keystone","identity",True,"admin","http://Five-127.0.0.1:5002" "endpoint13_id","RegionFive","keystone","identity",True,"internal","https://Five-127.0.0.1:5001"
"endpoint14_id","RegionFive","keystone","identity",True,"internal","https://Five-127.0.0.1:5001" "endpoint14_id","RegionFive","keystone","identity",True,"public","https://Five-127.0.0.1:5000"
"endpoint15_id","RegionFive","keystone","identity",True,"public","https://Five-127.0.0.1:5000" "endpoint15_id","RegionSix","keystone","identity",True,"admin","http://Six-127.0.0.1:5002"
"endpoint16_id","RegionSix","keystone","identity",True,"admin","http://Six-127.0.0.1:5002" "endpoint16_id","RegionSix","keystone","identity",True,"public","https://Six-127.0.0.1:5000"
"endpoint17_id","RegionSix","keystone","identity",True,"internal","https://Six-127.0.0.1:5001" "endpoint17_id","RegionSeven","keystone","identity",True,"admin","http://Seven-127.0.0.1:5002"
"endpoint18_id","RegionSix","keystone","identity",True,"public","https://Six-127.0.0.1:5000" "endpoint18_id","RegionSeven","keystone","identity",True,"internal","https://Seven-127.0.0.1:5001"
"endpoint19_id","RegionSeven","keystone","identity",True,"admin","http://Seven-127.0.0.1:5002"
"endpoint20_id","RegionSeven","keystone","identity",True,"internal","https://Seven-127.0.0.1:5001"
"endpoint21_id","RegionSeven","keystone","identity",True,"public","https://Seven-127.0.0.1:5000"
') ')
instances = described_class.instances instances = described_class.instances
expect(instances).to have_array_of_instances_hash([ expect(instances).to have_array_of_instances_hash([
@ -183,29 +180,29 @@ region="region"
{ {
:name=>"RegionFive/keystone::identity", :name=>"RegionFive/keystone::identity",
:ensure=>:present, :ensure=>:present,
:id=>"endpoint13_id,endpoint14_id,endpoint15_id", :id=>",endpoint13_id,endpoint14_id",
:region=>"RegionFive", :region=>"RegionFive",
:admin_url=>"http://Five-127.0.0.1:5002", :admin_url=>'',
:internal_url=>"https://Five-127.0.0.1:5001", :internal_url=>"https://Five-127.0.0.1:5001",
:public_url=>"https://Five-127.0.0.1:5000" :public_url=>"https://Five-127.0.0.1:5000"
}, },
{ {
:name=>"RegionSix/keystone::identity", :name=>"RegionSix/keystone::identity",
:ensure=>:present, :ensure=>:present,
:id=>"endpoint16_id,endpoint17_id,endpoint18_id", :id=>"endpoint15_id,,endpoint16_id",
:region=>"RegionSix", :region=>"RegionSix",
:admin_url=>"http://Six-127.0.0.1:5002", :admin_url=>"http://Six-127.0.0.1:5002",
:internal_url=>"https://Six-127.0.0.1:5001", :internal_url=>'',
:public_url=>"https://Six-127.0.0.1:5000" :public_url=>"https://Six-127.0.0.1:5000"
}, },
{ {
:name=>"RegionSeven/keystone::identity", :name=>"RegionSeven/keystone::identity",
:ensure=>:present, :ensure=>:present,
:id=>"endpoint19_id,endpoint20_id,endpoint21_id", :id=>"endpoint17_id,endpoint18_id,",
:region=>"RegionSeven", :region=>"RegionSeven",
:admin_url=>"http://Seven-127.0.0.1:5002", :admin_url=>"http://Seven-127.0.0.1:5002",
:internal_url=>"https://Seven-127.0.0.1:5001", :internal_url=>"https://Seven-127.0.0.1:5001",
:public_url=>"https://Seven-127.0.0.1:5000" :public_url=>''
} }
]) ])
end end