openstack
/
cookbook-openstackclient
Code Issues Proposed changes

Merge pull request #8 from scassiba/chef13_fixups 

fix more resource collisions
This commit is contained in:
Jan Klare 2018-02-20 13:46:22 +01:00 committed by GitHub
parent 332f73217b 15c451bc12
commit cf1bf525a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/openstack_endpoint.rb
View File

@ -31,14 +31,14 @@ module OpenstackclientCookbook
action :create do action :create do
service = new_resource.connection.services.find { |s| s.name == new_resource.service_name } service = new_resource.connection.services.find { |s| s.name == new_resource.service_name }
endpoint = new_resource.connection.endpoints.find do |e| endpoint = new_resource.connection.endpoints.find do |e|
e.service_id == service.id && e.interface == interface e.service_id == service.id && e.interface == new_resource.interface
end end
if endpoint if endpoint
log "#{new_resource.interface}_endpoint for \"#{new_resource.service_name}\" already exists" log "#{new_resource.interface}_endpoint for \"#{new_resource.service_name}\" already exists"
else else
new_resource.connection.endpoints.create( new_resource.connection.endpoints.create(
interface: interface, interface: new_resource.interface,
url: new_resource.url, url: new_resource.url,
service_id: service.id, service_id: service.id,
name: new_resource.endpoint_name, name: new_resource.endpoint_name,