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
This commit is contained in:
parent
0b343d3c1b
commit
a48eb7cca2
|
@ -25,23 +25,23 @@ module OpenstackclientCookbook
|
||||||
default_action :create
|
default_action :create
|
||||||
|
|
||||||
action :create do
|
action :create do
|
||||||
domain = connection.domains.find { |u| u.id == domain_name } ||
|
domain = new_resource.connection.domains.find { |u| u.id == new_resource.domain_name } ||
|
||||||
connection.domains.find { |u| u.name == domain_name }
|
new_resource.connection.domains.find { |u| u.name == new_resource.domain_name }
|
||||||
if domain
|
if domain
|
||||||
log "Domain with name: \"#{domain_name}\" already exists"
|
log "Domain with name: \"#{new_resource.domain_name}\" already exists"
|
||||||
else
|
else
|
||||||
connection.domains.create(
|
new_resource.connection.domains.create(
|
||||||
name: domain_name
|
name: new_resource.domain_name
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
action :delete do
|
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
|
if domain
|
||||||
domain.destroy
|
domain.destroy
|
||||||
else
|
else
|
||||||
log "Domain with name: \"#{domain_name}\" doesn't exist"
|
log "Domain with name: \"#{new_resource.domain_name}\" doesn't exist"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -29,31 +29,31 @@ module OpenstackclientCookbook
|
||||||
default_action :create
|
default_action :create
|
||||||
|
|
||||||
action :create do
|
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 }
|
||||||
endpoint = 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 "#{interface}_endpoint for \"#{service_name}\" already exists"
|
log "#{new_resource.interface}_endpoint for \"#{new_resource.service_name}\" already exists"
|
||||||
else
|
else
|
||||||
connection.endpoints.create(
|
new_resource.connection.endpoints.create(
|
||||||
interface: interface,
|
interface: new_resource.interface,
|
||||||
url: url,
|
url: new_resource.url,
|
||||||
service_id: service.id,
|
service_id: service.id,
|
||||||
name: endpoint_name,
|
name: new_resource.endpoint_name,
|
||||||
region: region
|
region: new_resource.region
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
action :delete do
|
action :delete do
|
||||||
service = connection.services.find { |s| s.name == service_name }
|
service = new_resource.connection.services.find { |s| s.name == service_name }
|
||||||
endpoint = 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 == interface
|
||||||
end
|
end
|
||||||
if endpoint
|
if endpoint
|
||||||
connection.endpoints.destroy(endpoint.id)
|
new_resource.connection.endpoints.destroy(endpoint.id)
|
||||||
else
|
else
|
||||||
log "#{interface}_endpoint for \"#{service_name}\" doesn't exist"
|
log "#{interface}_endpoint for \"#{service_name}\" doesn't exist"
|
||||||
end
|
end
|
||||||
|
|
|
@ -25,20 +25,20 @@ module OpenstackclientCookbook
|
||||||
default_action :create
|
default_action :create
|
||||||
|
|
||||||
action :create do
|
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
|
if project
|
||||||
log "Project with name: \"#{project_name}\" already exists"
|
log "Project with name: \"#{new_resource.project_name}\" already exists"
|
||||||
else
|
else
|
||||||
connection.projects.create name: project_name
|
new_resource.connection.projects.create name: new_resource.project_name
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
action :delete do
|
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
|
if project
|
||||||
project.destroy
|
new_resource.project.destroy
|
||||||
else
|
else
|
||||||
log "Project with name: \"#{project_name}\" doesn't exist"
|
log "Project with name: \"#{new_resource.project_name}\" doesn't exist"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -25,20 +25,20 @@ module OpenstackclientCookbook
|
||||||
default_action :create
|
default_action :create
|
||||||
|
|
||||||
action :create do
|
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
|
if role
|
||||||
log "Role with name: \"#{role_name}\" already exists"
|
log "Role with name: \"#{new_resource.role_name}\" already exists"
|
||||||
else
|
else
|
||||||
connection.roles.create name: role_name
|
new_resource.connection.roles.create name: new_resource.role_name
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
action :delete do
|
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
|
if role
|
||||||
role.destroy
|
role.destroy
|
||||||
else
|
else
|
||||||
log "Role with name: \"#{role_name}\" doesn't exist"
|
log "Role with name: \"#{new_resource.role_name}\" doesn't exist"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -26,23 +26,23 @@ module OpenstackclientCookbook
|
||||||
default_action :create
|
default_action :create
|
||||||
|
|
||||||
action :create do
|
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
|
if service
|
||||||
log "Service with name: \"#{service_name}\" already exists"
|
log "Service with name: \"#{new_resource.service_name}\" already exists"
|
||||||
else
|
else
|
||||||
connection.services.create(
|
new_resource.connection.services.create(
|
||||||
name: service_name,
|
name: new_resource.service_name,
|
||||||
type: type
|
type: new_resource.type
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
action :delete do
|
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
|
if service
|
||||||
service.destroy
|
service.destroy
|
||||||
else
|
else
|
||||||
log "Service with name: \"#{service_name}\" doesn't exist"
|
log "Service with name: \"#{new_resource.service_name}\" doesn't exist"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -30,50 +30,50 @@ module OpenstackclientCookbook
|
||||||
default_action :create
|
default_action :create
|
||||||
|
|
||||||
action :create do
|
action :create do
|
||||||
user = connection.users.find { |u| u.name == user_name }
|
user = new_resource.connection.users.find { |u| u.name == new_resource.user_name }
|
||||||
project = connection.projects.find { |p| p.name == project_name }
|
project = new_resource.connection.projects.find { |p| p.name == new_resource.project_name }
|
||||||
domain = connection.domains.find { |u| u.name == domain_name }
|
domain = new_resource.connection.domains.find { |u| u.name == new_resource.domain_name }
|
||||||
if user
|
if user
|
||||||
log "User with name: \"#{user_name}\" already exists"
|
log "User with name: \"#{new_resource.user_name}\" already exists"
|
||||||
elsif domain
|
elsif domain
|
||||||
connection.users.create(
|
new_resource.connection.users.create(
|
||||||
name: user_name,
|
name: new_resource.user_name,
|
||||||
domain_id: domain.id,
|
domain_id: domain.id,
|
||||||
email: email,
|
email: new_resource.email,
|
||||||
default_project_id: project ? project.id : nil,
|
default_project_id: project ? project.id : nil,
|
||||||
password: password
|
password: new_resource.password
|
||||||
)
|
)
|
||||||
else
|
else
|
||||||
connection.users.create(
|
new_resource.connection.users.create(
|
||||||
name: user_name,
|
name: new_resource.user_name,
|
||||||
email: email,
|
email: new_resource.email,
|
||||||
default_project_id: project ? project.id : nil,
|
default_project_id: project ? project.id : nil,
|
||||||
password: password
|
password: new_resource.password
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
action :delete do
|
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
|
if user
|
||||||
user.destroy
|
user.destroy
|
||||||
else
|
else
|
||||||
log "User with name: \"#{user_name}\" doesn't exist"
|
log "User with name: \"#{new_resource.user_name}\" doesn't exist"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Grant a role in a project
|
# Grant a role in a project
|
||||||
action :grant_role do
|
action :grant_role do
|
||||||
user = connection.users.find { |u| u.name == user_name }
|
user = new_resource.connection.users.find { |u| u.name == new_resource.user_name }
|
||||||
project = connection.projects.find { |p| p.name == project_name }
|
project = new_resource.connection.projects.find { |p| p.name == new_resource.project_name }
|
||||||
role = connection.roles.find { |r| r.name == role_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
|
project.grant_role_to_user role.id, user.id if role && project && user
|
||||||
end
|
end
|
||||||
|
|
||||||
action :revoke_role do
|
action :revoke_role do
|
||||||
user = connection.users.find { |u| u.name == user_name }
|
user = new_resource.connection.users.find { |u| u.name == new_resource.user_name }
|
||||||
project = connection.projects.find { |p| p.name == project_name }
|
project = new_resource.connection.projects.find { |p| p.name == new_resource.project_name }
|
||||||
role = connection.roles.find { |r| r.name == role_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
|
project.revoke_role_from_user role.id, user.id if role && project && user
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -82,16 +82,16 @@ module OpenstackclientCookbook
|
||||||
# only used to identify a user who is in that domain. This action grants
|
# only used to identify a user who is in that domain. This action grants
|
||||||
# the user a role in the domain.
|
# the user a role in the domain.
|
||||||
action :grant_domain do
|
action :grant_domain do
|
||||||
user = connection.users.find { |u| u.name == user_name }
|
user = new_resource.connection.users.find { |u| u.name == new_resource.user_name }
|
||||||
domain = connection.domains.find { |p| p.name == domain_name }
|
domain = new_resource.connection.domains.find { |p| p.name == new_resource.domain_name }
|
||||||
role = connection.roles.find { |r| r.name == role_name }
|
role = new_resource.connection.roles.find { |r| r.name == new_resource.role_name }
|
||||||
user.grant_role role.id if role && domain && user
|
user.grant_role role.id if role && domain && user
|
||||||
end
|
end
|
||||||
|
|
||||||
action :revoke_domain do
|
action :revoke_domain do
|
||||||
user = connection.users.find { |u| u.name == user_name }
|
user = new_resource.connection.users.find { |u| u.name == new_resource.user_name }
|
||||||
domain = connection.domains.find { |p| p.name == domain_name }
|
domain = new_resource.connection.domains.find { |p| p.name == new_resource.domain_name }
|
||||||
role = connection.roles.find { |r| r.name == role_name }
|
role = new_resource.connection.roles.find { |r| r.name == new_resource.role_name }
|
||||||
user.revoke_role role.id if role && domain && user
|
user.revoke_role role.id if role && domain && user
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue