diff --git a/manifests/inspector.pp b/manifests/inspector.pp index 2965debb..063373a3 100644 --- a/manifests/inspector.pp +++ b/manifests/inspector.pp @@ -103,7 +103,7 @@ # # [*ironic_auth_url*] # (optional) Keystone authentication URL for Ironic -# Defautls to 'http://127.0.0.1:5000/v2.0' +# Defautls to 'http://127.0.0.1:5000/v3' # # [*ironic_max_retries*] # (optional) Maximum number of retries in case of conflict error @@ -139,7 +139,7 @@ # # [*swift_auth_url*] # (optional) Keystone authentication URL for Swift -# Defautls to 'http://127.0.0.1:5000/v2.0' +# Defautls to 'http://127.0.0.1:5000/v3' # # [*dnsmasq_ip_subnets*] # (optional) List of hashes with keys: 'tag', 'ip_range', 'netmask', and @@ -258,7 +258,7 @@ class ironic::inspector ( $ironic_tenant_name = 'services', $ironic_project_domain_name = 'Default', $ironic_user_domain_name = 'Default', - $ironic_auth_url = 'http://127.0.0.1:5000/v2.0', + $ironic_auth_url = 'http://127.0.0.1:5000/v3', $ironic_max_retries = 30, $ironic_retry_interval = 2, $swift_auth_type = 'password', @@ -267,7 +267,7 @@ class ironic::inspector ( $swift_tenant_name = 'services', $swift_project_domain_name = 'Default', $swift_user_domain_name = 'Default', - $swift_auth_url = 'http://127.0.0.1:5000/v2.0', + $swift_auth_url = 'http://127.0.0.1:5000/v3', $dnsmasq_ip_subnets = [], $dnsmasq_local_ip = '192.168.0.1', $dnsmasq_dhcp_hostsdir = undef, diff --git a/releasenotes/notes/change-keystone-v3-704852e6e128c60f.yaml b/releasenotes/notes/change-keystone-v3-704852e6e128c60f.yaml new file mode 100644 index 00000000..c12e8b5b --- /dev/null +++ b/releasenotes/notes/change-keystone-v3-704852e6e128c60f.yaml @@ -0,0 +1,8 @@ +--- +upgrade: + - | + The default value of ironic::inspector::ironic_auth_url is + changed from http://127.0.0.1:5000/v2.0 to http://127.0.0.1:5000/v3 + - | + The default value of ironic::inspector::swift_auth_url is + changed from http://127.0.0.1:5000/v2.0 to http://127.0.0.1:5000/v3 diff --git a/spec/classes/ironic_inspector_spec.rb b/spec/classes/ironic_inspector_spec.rb index 0bff52aa..a262c744 100644 --- a/spec/classes/ironic_inspector_spec.rb +++ b/spec/classes/ironic_inspector_spec.rb @@ -38,13 +38,13 @@ describe 'ironic::inspector' do :ironic_auth_type => 'password', :ironic_username => 'ironic', :ironic_tenant_name => 'services', - :ironic_auth_url => 'http://127.0.0.1:5000/v2.0', + :ironic_auth_url => 'http://127.0.0.1:5000/v3', :ironic_max_retries => 30, :ironic_retry_interval => 2, :swift_auth_type => 'password', :swift_username => 'ironic', :swift_tenant_name => 'services', - :swift_auth_url => 'http://127.0.0.1:5000/v2.0', + :swift_auth_url => 'http://127.0.0.1:5000/v3', :dnsmasq_ip_subnets => [{ 'ip_range' => '192.168.0.100,192.168.0.120' }, { 'tag' => 'subnet1', @@ -180,11 +180,11 @@ describe 'ironic::inspector' do :ironic_password => 'password', :ironic_project_domain_name => 'Default', :ironic_user_domain_name => 'Default', - :ironic_auth_url => 'http://192.168.0.1:5000/v2.0', + :ironic_auth_url => 'http://192.168.0.1:5000/v3', :swift_password => 'password', :swift_project_domain_name => 'Default', :swift_user_domain_name => 'Default', - :swift_auth_url => 'http://192.168.0.1:5000/v2.0', + :swift_auth_url => 'http://192.168.0.1:5000/v3', :pxe_transfer_protocol => 'http', :additional_processing_hooks => 'hook1,hook2', :ramdisk_kernel_args => 'foo=bar',