openstack/puppet-nova
Code Issues Proposed changes

Merge "Remove /v3 suffix from auth url"

Browse Source
This commit is contained in:
Zuul
2025-09-16 05:30:39 +00:00
committed by Gerrit Code Review
parent f94ac764eb da755d2f47
commit 987f630cfd
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/network/neutron.pp
View File

@@ -40,7 +40,7 @@
# (optional) Points to the OpenStack Identity server IP and port.
# This is the Identity (keystone) admin API server IP and port value,
# and not the Identity service API IP and port.
# Defaults to 'http://127.0.0.1:5000/v3'
# Defaults to 'http://127.0.0.1:5000'
#
# [*valid_interfaces*]
# (optional) The endpoint type to lookup when talking to Neutron.
@@ -100,7 +100,7 @@ class nova::network::neutron (
$system_scope = $facts['os_service_default'],
$username = 'neutron',
$user_domain_name = 'Default',
$auth_url = 'http://127.0.0.1:5000/v3',
$auth_url = 'http://127.0.0.1:5000',
$valid_interfaces = $facts['os_service_default'],
$endpoint_override = $facts['os_service_default'],
$timeout = '30',

4
manifests/placement.pp
View File

@@ -50,12 +50,12 @@
# (optional) Points to the OpenStack Identity server IP and port.
# This is the Identity (keystone) admin API server IP and port value,
# and not the Identity service API IP and port.
# Defaults to 'http://127.0.0.1:5000/v3'
# Defaults to 'http://127.0.0.1:5000'
#
class nova::placement (
$password,
$auth_type = 'password',
$auth_url = 'http://127.0.0.1:5000/v3',
$auth_url = 'http://127.0.0.1:5000',
$region_name = 'RegionOne',
$valid_interfaces = $facts['os_service_default'],
$project_domain_name = 'Default',

2
spec/classes/nova_network_neutron_spec.rb
View File

@@ -11,7 +11,7 @@ describe 'nova::network::neutron' do
:region_name => 'RegionOne',
:username => 'neutron',
:user_domain_name => 'Default',
:auth_url => 'http://127.0.0.1:5000/v3',
:auth_url => 'http://127.0.0.1:5000',
:valid_interfaces => '<SERVICE DEFAULT>',
:endpoint_override => '<SERVICE DEFAULT>',
:http_retries => '<SERVICE DEFAULT>',

4
spec/classes/nova_placement_spec.rb
View File

@@ -9,7 +9,7 @@ describe 'nova::placement' do
:region_name => 'RegionOne',
:username => 'placement',
:user_domain_name => 'Default',
:auth_url => 'http://127.0.0.1:5000/v3',
:auth_url => 'http://127.0.0.1:5000',
}
end
@@ -44,7 +44,7 @@ describe 'nova::placement' do
:valid_interfaces => 'internal,public',
:username => 'placement2',
:user_domain_name => 'default',
:auth_url => 'https://127.0.0.1:5000/v3',
:auth_url => 'http://127.0.0.1:5000/v3',
)
end