From a48eb7cca2099c61c7bc5727ffa01b1b4ef29b36 Mon Sep 17 00:00:00 2001 From: Samuel Cassiba Date: Fri, 9 Feb 2018 14:52:47 -0800 Subject: [PATCH] Refer to property_name as new_resource.property_name In Chef 14, the short form of property_name is removed, in favor of new_resource.property_name.[0] [0] https://docs.chef.io/deprecations_namespace_collisions.html --- libraries/openstack_domain.rb | 14 ++++----- libraries/openstack_endpoint.rb | 24 +++++++-------- libraries/openstack_project.rb | 12 ++++---- libraries/openstack_role.rb | 10 +++--- libraries/openstack_service.rb | 14 ++++----- libraries/openstack_user.rb | 54 ++++++++++++++++----------------- 6 files changed, 64 insertions(+), 64 deletions(-) diff --git a/libraries/openstack_domain.rb b/libraries/openstack_domain.rb index acef8e2..7a41d13 100644 --- a/libraries/openstack_domain.rb +++ b/libraries/openstack_domain.rb @@ -25,23 +25,23 @@ module OpenstackclientCookbook default_action :create action :create do - domain = connection.domains.find { |u| u.id == domain_name } || - connection.domains.find { |u| u.name == domain_name } + domain = new_resource.connection.domains.find { |u| u.id == new_resource.domain_name } || + new_resource.connection.domains.find { |u| u.name == new_resource.domain_name } if domain - log "Domain with name: \"#{domain_name}\" already exists" + log "Domain with name: \"#{new_resource.domain_name}\" already exists" else - connection.domains.create( - name: domain_name + new_resource.connection.domains.create( + name: new_resource.domain_name ) end end action :delete do - domain = connection.domains.find { |u| u.name == domain_name } + domain = new_resource.connection.domains.find { |u| u.name == new_resource.domain_name } if domain domain.destroy else - log "Domain with name: \"#{domain_name}\" doesn't exist" + log "Domain with name: \"#{new_resource.domain_name}\" doesn't exist" end end end diff --git a/libraries/openstack_endpoint.rb b/libraries/openstack_endpoint.rb index 8c27db3..d2a2ee4 100644 --- a/libraries/openstack_endpoint.rb +++ b/libraries/openstack_endpoint.rb @@ -29,31 +29,31 @@ module OpenstackclientCookbook default_action :create action :create do - service = connection.services.find { |s| s.name == service_name } - endpoint = connection.endpoints.find do |e| - e.service_id == service.id && e.interface == interface + service = new_resource.connection.services.find { |s| s.name == new_resource.service_name } + endpoint = new_resource.connection.endpoints.find do |e| + e.service_id == service.id && e.interface == new_resource.interface end if endpoint - log "#{interface}_endpoint for \"#{service_name}\" already exists" + log "#{new_resource.interface}_endpoint for \"#{new_resource.service_name}\" already exists" else - connection.endpoints.create( - interface: interface, - url: url, + new_resource.connection.endpoints.create( + interface: new_resource.interface, + url: new_resource.url, service_id: service.id, - name: endpoint_name, - region: region + name: new_resource.endpoint_name, + region: new_resource.region ) end end action :delete do - service = connection.services.find { |s| s.name == service_name } - endpoint = connection.endpoints.find do |e| + service = new_resource.connection.services.find { |s| s.name == service_name } + endpoint = new_resource.connection.endpoints.find do |e| e.service_id == service.id && e.interface == interface end if endpoint - connection.endpoints.destroy(endpoint.id) + new_resource.connection.endpoints.destroy(endpoint.id) else log "#{interface}_endpoint for \"#{service_name}\" doesn't exist" end diff --git a/libraries/openstack_project.rb b/libraries/openstack_project.rb index 731bdc8..472362d 100644 --- a/libraries/openstack_project.rb +++ b/libraries/openstack_project.rb @@ -25,20 +25,20 @@ module OpenstackclientCookbook default_action :create action :create do - project = connection.projects.find { |p| p.name == project_name } + project = new_resource.connection.projects.find { |p| p.name == new_resource.project_name } if project - log "Project with name: \"#{project_name}\" already exists" + log "Project with name: \"#{new_resource.project_name}\" already exists" else - connection.projects.create name: project_name + new_resource.connection.projects.create name: new_resource.project_name end end action :delete do - project = connection.projects.find { |p| p.name == project_name } + project = new_resource.connection.projects.find { |p| p.name == new_resource.project_name } if project - project.destroy + new_resource.project.destroy else - log "Project with name: \"#{project_name}\" doesn't exist" + log "Project with name: \"#{new_resource.project_name}\" doesn't exist" end end end diff --git a/libraries/openstack_role.rb b/libraries/openstack_role.rb index 79fa88b..06dc6db 100644 --- a/libraries/openstack_role.rb +++ b/libraries/openstack_role.rb @@ -25,20 +25,20 @@ module OpenstackclientCookbook default_action :create action :create do - role = connection.roles.find { |r| r.name == role_name } + role = new_resource.connection.roles.find { |r| r.name == new_resource.role_name } if role - log "Role with name: \"#{role_name}\" already exists" + log "Role with name: \"#{new_resource.role_name}\" already exists" else - connection.roles.create name: role_name + new_resource.connection.roles.create name: new_resource.role_name end end action :delete do - role = connection.roles.find { |r| r.name == role_name } + role = new_resource.connection.roles.find { |r| r.name == new_resource.role_name } if role role.destroy else - log "Role with name: \"#{role_name}\" doesn't exist" + log "Role with name: \"#{new_resource.role_name}\" doesn't exist" end end end diff --git a/libraries/openstack_service.rb b/libraries/openstack_service.rb index 76e035d..2c8a2b1 100644 --- a/libraries/openstack_service.rb +++ b/libraries/openstack_service.rb @@ -26,23 +26,23 @@ module OpenstackclientCookbook default_action :create action :create do - service = connection.services.find { |s| s.name == service_name } + service = new_resource.connection.services.find { |s| s.name == new_resource.service_name } if service - log "Service with name: \"#{service_name}\" already exists" + log "Service with name: \"#{new_resource.service_name}\" already exists" else - connection.services.create( - name: service_name, - type: type + new_resource.connection.services.create( + name: new_resource.service_name, + type: new_resource.type ) end end action :delete do - service = connection.services.find { |s| s.name == service_name } + service = new_resource.connection.services.find { |s| s.name == new_resource.service_name } if service service.destroy else - log "Service with name: \"#{service_name}\" doesn't exist" + log "Service with name: \"#{new_resource.service_name}\" doesn't exist" end end end diff --git a/libraries/openstack_user.rb b/libraries/openstack_user.rb index fd1822a..716c977 100644 --- a/libraries/openstack_user.rb +++ b/libraries/openstack_user.rb @@ -30,50 +30,50 @@ module OpenstackclientCookbook default_action :create action :create do - user = connection.users.find { |u| u.name == user_name } - project = connection.projects.find { |p| p.name == project_name } - domain = connection.domains.find { |u| u.name == domain_name } + user = new_resource.connection.users.find { |u| u.name == new_resource.user_name } + project = new_resource.connection.projects.find { |p| p.name == new_resource.project_name } + domain = new_resource.connection.domains.find { |u| u.name == new_resource.domain_name } if user - log "User with name: \"#{user_name}\" already exists" + log "User with name: \"#{new_resource.user_name}\" already exists" elsif domain - connection.users.create( - name: user_name, + new_resource.connection.users.create( + name: new_resource.user_name, domain_id: domain.id, - email: email, + email: new_resource.email, default_project_id: project ? project.id : nil, - password: password + password: new_resource.password ) else - connection.users.create( - name: user_name, - email: email, + new_resource.connection.users.create( + name: new_resource.user_name, + email: new_resource.email, default_project_id: project ? project.id : nil, - password: password + password: new_resource.password ) end end action :delete do - user = connection.users.find { |u| u.name == user_name } + user = new_resource.connection.users.find { |u| u.name == new_resource.user_name } if user user.destroy else - log "User with name: \"#{user_name}\" doesn't exist" + log "User with name: \"#{new_resource.user_name}\" doesn't exist" end end # Grant a role in a project action :grant_role do - user = connection.users.find { |u| u.name == user_name } - project = connection.projects.find { |p| p.name == project_name } - role = connection.roles.find { |r| r.name == role_name } + user = new_resource.connection.users.find { |u| u.name == new_resource.user_name } + project = new_resource.connection.projects.find { |p| p.name == new_resource.project_name } + role = new_resource.connection.roles.find { |r| r.name == new_resource.role_name } project.grant_role_to_user role.id, user.id if role && project && user end action :revoke_role do - user = connection.users.find { |u| u.name == user_name } - project = connection.projects.find { |p| p.name == project_name } - role = connection.roles.find { |r| r.name == role_name } + user = new_resource.connection.users.find { |u| u.name == new_resource.user_name } + project = new_resource.connection.projects.find { |p| p.name == new_resource.project_name } + role = new_resource.connection.roles.find { |r| r.name == new_resource.role_name } project.revoke_role_from_user role.id, user.id if role && project && user end @@ -82,17 +82,17 @@ module OpenstackclientCookbook # only used to identify a user who is in that domain. This action grants # the user a role in the domain. action :grant_domain do - user = connection.users.find { |u| u.name == user_name } - domain = connection.domains.find { |p| p.name == domain_name } - role = connection.roles.find { |r| r.name == role_name } + user = new_resource.connection.users.find { |u| u.name == new_resource.user_name } + domain = new_resource.connection.domains.find { |p| p.name == new_resource.domain_name } + role = new_resource.connection.roles.find { |r| r.name == new_resource.role_name } user.grant_role role.id if role && domain && user end action :revoke_domain do - user = connection.users.find { |u| u.name == user_name } - domain = connection.domains.find { |p| p.name == domain_name } - role = connection.roles.find { |r| r.name == role_name } - user.revoke_role role.id if role && domain && user + user = new_resource.connection.users.find { |u| u.name == new_resource.user_name } + domain = new_resource.connection.domains.find { |p| p.name == new_resource.domain_name } + role = new_resource.connection.roles.find { |r| r.name == new_resource.role_name } + user.revoke_role role.id if role && domain && user end end end