openstack/puppet-ironic
Code Issues Proposed changes

Replace port 35357 with 5000

Browse Source 
Now that the v2.0 API has been removed, we don't have a reason to
include deployment instructions for two separate applications on
different ports.

Change-Id: Ibbb4136bacdfb36c619ed246fa0257d62a36cac7
This commit is contained in:
qiaomin 2018-05-13 00:49:29 +08:00
parent 9be8befb75
commit 4ad193f9f2
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/api/authtoken.pp
View File

@ -14,7 +14,7 @@
# #
# [*auth_url*] # [*auth_url*]
# (Optional) The URL to use for authentication. # (Optional) The URL to use for authentication.
# Defaults to 'http://127.0.0.1:35357'. # Defaults to 'http://127.0.0.1:5000'.
# #
# [*project_name*] # [*project_name*]
# (Optional) Service project name # (Optional) Service project name
@ -187,7 +187,7 @@
class ironic::api::authtoken( class ironic::api::authtoken(
$username = 'ironic', $username = 'ironic',
$password = $::os_service_default, $password = $::os_service_default,
$auth_url = 'http://127.0.0.1:35357', $auth_url = 'http://127.0.0.1:5000',
$project_name = 'services', $project_name = 'services',
$user_domain_name = 'Default', $user_domain_name = 'Default',
$project_domain_name = 'Default', $project_domain_name = 'Default',

4
manifests/inspector/authtoken.pp
View File

@ -14,7 +14,7 @@
# #
# [*auth_url*] # [*auth_url*]
# (Optional) The URL to use for authentication. # (Optional) The URL to use for authentication.
# Defaults to 'http://127.0.0.1:35357'. # Defaults to 'http://127.0.0.1:5000'.
# #
# [*project_name*] # [*project_name*]
# (Optional) Service project name # (Optional) Service project name
@ -187,7 +187,7 @@
class ironic::inspector::authtoken( class ironic::inspector::authtoken(
$username = 'ironic', $username = 'ironic',
$password = $::os_service_default, $password = $::os_service_default,
$auth_url = 'http://127.0.0.1:35357', $auth_url = 'http://127.0.0.1:5000',
$project_name = 'services', $project_name = 'services',
$user_domain_name = 'Default', $user_domain_name = 'Default',
$project_domain_name = 'Default', $project_domain_name = 'Default',

4
spec/classes/ironic_api_authtoken_spec.rb
View File

@ -13,7 +13,7 @@ describe 'ironic::api::authtoken' do
it 'configure keystone_authtoken' do it 'configure keystone_authtoken' do
is_expected.to contain_ironic_config('keystone_authtoken/username').with_value('ironic') is_expected.to contain_ironic_config('keystone_authtoken/username').with_value('ironic')
is_expected.to contain_ironic_config('keystone_authtoken/password').with_value('ironic_password') is_expected.to contain_ironic_config('keystone_authtoken/password').with_value('ironic_password')
is_expected.to contain_ironic_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:35357') is_expected.to contain_ironic_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:5000')
is_expected.to contain_ironic_config('keystone_authtoken/project_name').with_value('services') is_expected.to contain_ironic_config('keystone_authtoken/project_name').with_value('services')
is_expected.to contain_ironic_config('keystone_authtoken/user_domain_name').with_value('Default') is_expected.to contain_ironic_config('keystone_authtoken/user_domain_name').with_value('Default')
is_expected.to contain_ironic_config('keystone_authtoken/project_domain_name').with_value('Default') is_expected.to contain_ironic_config('keystone_authtoken/project_domain_name').with_value('Default')
@ -53,7 +53,7 @@ describe 'ironic::api::authtoken' do
:www_authenticate_uri => 'https://10.0.0.1:9999/', :www_authenticate_uri => 'https://10.0.0.1:9999/',
:username => 'myuser', :username => 'myuser',
:password => 'mypasswd', :password => 'mypasswd',
:auth_url => 'http://:127.0.0.1:35357', :auth_url => 'http://:127.0.0.1:5000',
:project_name => 'service_project', :project_name => 'service_project',
:user_domain_name => 'domainX', :user_domain_name => 'domainX',
:project_domain_name => 'domainX', :project_domain_name => 'domainX',

4
spec/classes/ironic_inspector_authtoken_spec.rb
View File

@ -13,7 +13,7 @@ describe 'ironic::inspector::authtoken' do
it 'configure keystone_authtoken' do it 'configure keystone_authtoken' do
is_expected.to contain_ironic_inspector_config('keystone_authtoken/username').with_value('ironic') is_expected.to contain_ironic_inspector_config('keystone_authtoken/username').with_value('ironic')
is_expected.to contain_ironic_inspector_config('keystone_authtoken/password').with_value('ironic_password') is_expected.to contain_ironic_inspector_config('keystone_authtoken/password').with_value('ironic_password')
is_expected.to contain_ironic_inspector_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:35357') is_expected.to contain_ironic_inspector_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:5000')
is_expected.to contain_ironic_inspector_config('keystone_authtoken/project_name').with_value('services') is_expected.to contain_ironic_inspector_config('keystone_authtoken/project_name').with_value('services')
is_expected.to contain_ironic_inspector_config('keystone_authtoken/user_domain_name').with_value('Default') is_expected.to contain_ironic_inspector_config('keystone_authtoken/user_domain_name').with_value('Default')
is_expected.to contain_ironic_inspector_config('keystone_authtoken/project_domain_name').with_value('Default') is_expected.to contain_ironic_inspector_config('keystone_authtoken/project_domain_name').with_value('Default')
@ -53,7 +53,7 @@ describe 'ironic::inspector::authtoken' do
:www_authenticate_uri => 'https://10.0.0.1:9999/', :www_authenticate_uri => 'https://10.0.0.1:9999/',
:username => 'myuser', :username => 'myuser',
:password => 'mypasswd', :password => 'mypasswd',
:auth_url => 'http://:127.0.0.1:35357', :auth_url => 'http://:127.0.0.1:5000',
:project_name => 'service_project', :project_name => 'service_project',
:user_domain_name => 'domainX', :user_domain_name => 'domainX',
:project_domain_name => 'domainX', :project_domain_name => 'domainX',

2
spec/unit/provider/ironic_spec.rb
View File

@ -14,7 +14,7 @@ describe Puppet::Provider::Ironic do
'project_name' => 'admin_tenant', 'project_name' => 'admin_tenant',
'username' => 'admin', 'username' => 'admin',
'password' => 'password', 'password' => 'password',
'www_authenticate_uri' => 'https://192.168.56.210:35357/', 'www_authenticate_uri' => 'https://192.168.56.210:5000/',
'project_domain_name' => 'admin_tenant_domain', 'project_domain_name' => 'admin_tenant_domain',
'user_domain_name' => 'admin_domain', 'user_domain_name' => 'admin_domain',
} }