From d4b5ebbaaaac8aba0beadffe27e7816720859f03 Mon Sep 17 00:00:00 2001 From: Corey Hemminger Date: Fri, 23 Jan 2026 18:51:33 -0600 Subject: [PATCH 1/4] fix: switch to cookstyle Signed-off-by: Corey Hemminger --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index c29f133..c441101 100644 --- a/Gemfile +++ b/Gemfile @@ -16,6 +16,6 @@ group :debug do gem "pry" end -group :chefstyle do - gem "chefstyle", "2.2.3" +group :cookstyle do + gem "cookstyle" end From 0eca239e6f8c82f8d99b0a1cfbafd7212ac54edd Mon Sep 17 00:00:00 2001 From: Corey Hemminger Date: Fri, 23 Jan 2026 18:53:04 -0600 Subject: [PATCH 2/4] Update .rubocop.yml to cookstyle Signed-off-by: Corey Hemminger --- .rubocop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 8fd406e..df528bf 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,6 +1,6 @@ --- require: - - chefstyle + - cookstyle AllCops: TargetRubyVersion: 3.1 From 7fe2c7d079dee4bd15050f9e68c5fd45a12fa685 Mon Sep 17 00:00:00 2001 From: Corey Hemminger Date: Fri, 23 Jan 2026 18:54:20 -0600 Subject: [PATCH 3/4] Update Rakefile for cookstyle Signed-off-by: Corey Hemminger --- Rakefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Rakefile b/Rakefile index 982e39d..d75e210 100644 --- a/Rakefile +++ b/Rakefile @@ -15,13 +15,13 @@ task :stats do end begin - require "chefstyle" + require "cookstyle" require "rubocop/rake_task" RuboCop::RakeTask.new(:style) do |task| - task.options += ["--display-cop-names", "--no-color"] + task.options += ["--chefstyle", "--display-cop-names", "--no-color"] end rescue LoadError - puts "chefstyle is not available. gem install chefstyle to do style checking." + puts "cookstyle is not available. gem install cookstyle to do style checking." end desc "Run all quality tasks" From 536fd2a4166dc1be30364060ce5c2c936b2d6484 Mon Sep 17 00:00:00 2001 From: Corey Hemminger Date: Fri, 23 Jan 2026 20:14:58 -0600 Subject: [PATCH 4/4] lint fixes Signed-off-by: Corey Hemminger --- lib/kitchen/driver/openstack.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/kitchen/driver/openstack.rb b/lib/kitchen/driver/openstack.rb index 1365b46..ac53857 100755 --- a/lib/kitchen/driver/openstack.rb +++ b/lib/kitchen/driver/openstack.rb @@ -178,12 +178,12 @@ def create_server raise(ActionFailed, "Cannot specify both network_ref and network_id") if config[:network_id] && config[:network_ref] if config[:network_id] - networks = [].concat([config[:network_id]]) + networks = [].push(config[:network_id]) server_def[:nics] = networks.flatten.map do |net_id| { "net_id" => net_id } end elsif config[:network_ref] - networks = [].concat([config[:network_ref]]) + networks = [].push(config[:network_ref]) server_def[:nics] = networks.flatten.map do |net| { "net_id" => find_network(net).id } end