From e216cc621e8ea92197ae3a63b3dbf35858564470 Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Sat, 22 Aug 2020 13:50:51 -0700 Subject: [PATCH] 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 --- README.rst | 2 +- libraries/openstack_domain.rb | 1 + libraries/openstack_endpoint.rb | 1 + libraries/openstack_project.rb | 1 + libraries/openstack_role.rb | 1 + libraries/openstack_service.rb | 1 + libraries/openstack_user.rb | 1 + metadata.rb | 2 +- 8 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index fdfb524..8798e02 100644 --- a/README.rst +++ b/README.rst @@ -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' diff --git a/libraries/openstack_domain.rb b/libraries/openstack_domain.rb index 22027bf..d5dd751 100644 --- a/libraries/openstack_domain.rb +++ b/libraries/openstack_domain.rb @@ -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 diff --git a/libraries/openstack_endpoint.rb b/libraries/openstack_endpoint.rb index aa96242..e603746 100644 --- a/libraries/openstack_endpoint.rb +++ b/libraries/openstack_endpoint.rb @@ -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 diff --git a/libraries/openstack_project.rb b/libraries/openstack_project.rb index 8ca9bfb..48c5207 100644 --- a/libraries/openstack_project.rb +++ b/libraries/openstack_project.rb @@ -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 diff --git a/libraries/openstack_role.rb b/libraries/openstack_role.rb index fe08117..9aa6fc9 100644 --- a/libraries/openstack_role.rb +++ b/libraries/openstack_role.rb @@ -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 diff --git a/libraries/openstack_service.rb b/libraries/openstack_service.rb index 6eddd78..f043b79 100644 --- a/libraries/openstack_service.rb +++ b/libraries/openstack_service.rb @@ -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 diff --git a/libraries/openstack_user.rb b/libraries/openstack_user.rb index 1e6e127..e6323ee 100755 --- a/libraries/openstack_user.rb +++ b/libraries/openstack_user.rb @@ -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' diff --git a/metadata.rb b/metadata.rb index fb3c644..e90cad4 100644 --- a/metadata.rb +++ b/metadata.rb @@ -12,4 +12,4 @@ version '20.0.0' supports os end -gem 'fog-openstack', '= 1.0.10' +gem 'fog-openstack', '~> 1.0.11'