openstack/puppet-ironic
Code Issues Proposed changes

Change keystone v2.0 url to v3

Browse Source 
Change-Id: I8661abba94285b117eda45484b7e48cb4d7de5ec
This commit is contained in:
Tobias Urdin 2019-02-24 13:08:16 +01:00
parent dd3f372f3b
commit a4055215c6
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/inspector.pp
View File

@ -103,7 +103,7 @@
# #
# [*ironic_auth_url*] # [*ironic_auth_url*]
# (optional) Keystone authentication URL for Ironic # (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*] # [*ironic_max_retries*]
# (optional) Maximum number of retries in case of conflict error # (optional) Maximum number of retries in case of conflict error
@ -139,7 +139,7 @@
# #
# [*swift_auth_url*] # [*swift_auth_url*]
# (optional) Keystone authentication URL for Swift # (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*] # [*dnsmasq_ip_subnets*]
# (optional) List of hashes with keys: 'tag', 'ip_range', 'netmask', and # (optional) List of hashes with keys: 'tag', 'ip_range', 'netmask', and
@ -258,7 +258,7 @@ class ironic::inspector (
$ironic_tenant_name = 'services', $ironic_tenant_name = 'services',
$ironic_project_domain_name = 'Default', $ironic_project_domain_name = 'Default',
$ironic_user_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_max_retries = 30,
$ironic_retry_interval = 2, $ironic_retry_interval = 2,
$swift_auth_type = 'password', $swift_auth_type = 'password',
@ -267,7 +267,7 @@ class ironic::inspector (
$swift_tenant_name = 'services', $swift_tenant_name = 'services',
$swift_project_domain_name = 'Default', $swift_project_domain_name = 'Default',
$swift_user_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_ip_subnets = [],
$dnsmasq_local_ip = '192.168.0.1', $dnsmasq_local_ip = '192.168.0.1',
$dnsmasq_dhcp_hostsdir = undef, $dnsmasq_dhcp_hostsdir = undef,

8
releasenotes/notes/change-keystone-v3-704852e6e128c60f.yaml Normal file
View File

@ -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

8
spec/classes/ironic_inspector_spec.rb
View File

@ -38,13 +38,13 @@ describe 'ironic::inspector' do
:ironic_auth_type => 'password', :ironic_auth_type => 'password',
:ironic_username => 'ironic', :ironic_username => 'ironic',
:ironic_tenant_name => 'services', :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_max_retries => 30,
:ironic_retry_interval => 2, :ironic_retry_interval => 2,
:swift_auth_type => 'password', :swift_auth_type => 'password',
:swift_username => 'ironic', :swift_username => 'ironic',
:swift_tenant_name => 'services', :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' => :dnsmasq_ip_subnets => [{ 'ip_range' =>
'192.168.0.100,192.168.0.120' }, '192.168.0.100,192.168.0.120' },
{ 'tag' => 'subnet1', { 'tag' => 'subnet1',
@ -180,11 +180,11 @@ describe 'ironic::inspector' do
:ironic_password => 'password', :ironic_password => 'password',
:ironic_project_domain_name => 'Default', :ironic_project_domain_name => 'Default',
:ironic_user_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_password => 'password',
:swift_project_domain_name => 'Default', :swift_project_domain_name => 'Default',
:swift_user_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', :pxe_transfer_protocol => 'http',
:additional_processing_hooks => 'hook1,hook2', :additional_processing_hooks => 'hook1,hook2',
:ramdisk_kernel_args => 'foo=bar', :ramdisk_kernel_args => 'foo=bar',