Cookstyle fixes for Chef 16

Also loosen the fog-openstack dependency a bit since this is now included in
Chef Workstation and will likely cause issues when doing testing.

Depends-On: https://review.opendev.org/747503
Depends-On: https://review.opendev.org/740342
Change-Id: Iaa0ccfa7dd47a729423fc7ce1115849a282d2511
Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
Lance Albertson 2020-08-22 13:50:51 -07:00
parent a2d102d5e2
commit e216cc621e
8 changed files with 8 additions and 2 deletions

View File

@ -14,7 +14,7 @@ Requirements
============
- Chef 15 or higher
- Chef Workstation 0.15.6 for testing (also includes Berkshelf for
- Chef Workstation 20.8.111 for testing (also includes Berkshelf for
cookbook dependency resolution)
- gem 'fog-openstack'

View File

@ -18,6 +18,7 @@ require_relative 'openstack_base'
module OpenstackclientCookbook
class OpenstackDomain < OpenstackBase
resource_name :openstack_domain
provides :openstack_domain
property :domain_name, String, name_property: true
property :connection_params, Hash, required: true

View File

@ -18,6 +18,7 @@ require_relative 'openstack_base'
module OpenstackclientCookbook
class OpenstackEndpoint < OpenstackBase
resource_name :openstack_endpoint
provides :openstack_endpoint
property :endpoint_name, String, name_property: true
property :service_name, String, required: true

View File

@ -18,6 +18,7 @@ require_relative 'openstack_base'
module OpenstackclientCookbook
class OpenstackProject < OpenstackBase
resource_name :openstack_project
provides :openstack_project
property :project_name, String, name_property: true
property :connection_params, Hash, required: true

View File

@ -18,6 +18,7 @@ require_relative 'openstack_base'
module OpenstackclientCookbook
class OpenstackRole < OpenstackBase
resource_name :openstack_role
provides :openstack_role
property :role_name, String, name_property: true
property :connection_params, Hash, required: true

View File

@ -18,6 +18,7 @@ require_relative 'openstack_base'
module OpenstackclientCookbook
class OpenstackService < OpenstackBase
resource_name :openstack_service
provides :openstack_service
property :service_name, String, name_property: true
property :type, String, required: true

View File

@ -17,6 +17,7 @@ require_relative 'openstack_base'
module OpenstackclientCookbook
class OpenstackUser < OpenstackBase
resource_name :openstack_user
provides :openstack_user
property :user_name, String, name_property: true
property :email, String, default: 'defaultmail'

View File

@ -12,4 +12,4 @@ version '20.0.0'
supports os
end
gem 'fog-openstack', '= 1.0.10'
gem 'fog-openstack', '~> 1.0.11'