From 0c396db86ce9c2fd4c84fb927fa79578fa374af9 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 27 Aug 2021 23:57:15 +0900 Subject: [PATCH] json_rpc: Fix the default project_name In Puppet OpenStack modules, the "services" project is widely used as the default project name. This change fixes the inconsistent default value used. Closes-Bug: #1941900 Change-Id: Ia10665056ad521ccb3a81c4490831da78bb5c45a --- manifests/json_rpc.pp | 4 ++-- spec/classes/ironic_json_rpc_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/json_rpc.pp b/manifests/json_rpc.pp index fc729045..c9368159 100644 --- a/manifests/json_rpc.pp +++ b/manifests/json_rpc.pp @@ -47,7 +47,7 @@ # # [*project_name*] # (optional) The Keystone project name. -# Defaults to 'service' +# Defaults to 'services' # # [*username*] # (optional) The admin username for ironic to connect to json_rpc. @@ -82,7 +82,7 @@ class ironic::json_rpc ( $use_ssl = false, $auth_type = 'password', $auth_url = $::os_service_default, - $project_name = 'service', + $project_name = 'services', $username = 'ironic', $password = $::os_service_default, $user_domain_name = 'Default', diff --git a/spec/classes/ironic_json_rpc_spec.rb b/spec/classes/ironic_json_rpc_spec.rb index e3fee5d1..d3dc3bcd 100644 --- a/spec/classes/ironic_json_rpc_spec.rb +++ b/spec/classes/ironic_json_rpc_spec.rb @@ -20,7 +20,7 @@ describe 'ironic::json_rpc' do let :default_params do { :auth_strategy => 'keystone', :auth_type => 'password', - :project_name => 'service', + :project_name => 'services', :use_ssl => false, :username => 'ironic', }