From 4ad193f9f2d6072d3bc770dba087c6578f2f2125 Mon Sep 17 00:00:00 2001 From: qiaomin Date: Sun, 13 May 2018 00:49:29 +0800 Subject: [PATCH] Replace port 35357 with 5000 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 --- manifests/api/authtoken.pp | 4 ++-- manifests/inspector/authtoken.pp | 4 ++-- spec/classes/ironic_api_authtoken_spec.rb | 4 ++-- spec/classes/ironic_inspector_authtoken_spec.rb | 4 ++-- spec/unit/provider/ironic_spec.rb | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifests/api/authtoken.pp b/manifests/api/authtoken.pp index 7b9412ef..38e8020b 100644 --- a/manifests/api/authtoken.pp +++ b/manifests/api/authtoken.pp @@ -14,7 +14,7 @@ # # [*auth_url*] # (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*] # (Optional) Service project name @@ -187,7 +187,7 @@ class ironic::api::authtoken( $username = 'ironic', $password = $::os_service_default, - $auth_url = 'http://127.0.0.1:35357', + $auth_url = 'http://127.0.0.1:5000', $project_name = 'services', $user_domain_name = 'Default', $project_domain_name = 'Default', diff --git a/manifests/inspector/authtoken.pp b/manifests/inspector/authtoken.pp index dfedb70c..59262cbd 100644 --- a/manifests/inspector/authtoken.pp +++ b/manifests/inspector/authtoken.pp @@ -14,7 +14,7 @@ # # [*auth_url*] # (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*] # (Optional) Service project name @@ -187,7 +187,7 @@ class ironic::inspector::authtoken( $username = 'ironic', $password = $::os_service_default, - $auth_url = 'http://127.0.0.1:35357', + $auth_url = 'http://127.0.0.1:5000', $project_name = 'services', $user_domain_name = 'Default', $project_domain_name = 'Default', diff --git a/spec/classes/ironic_api_authtoken_spec.rb b/spec/classes/ironic_api_authtoken_spec.rb index 30d25ca8..c5b6c19a 100644 --- a/spec/classes/ironic_api_authtoken_spec.rb +++ b/spec/classes/ironic_api_authtoken_spec.rb @@ -13,7 +13,7 @@ describe 'ironic::api::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/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/user_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/', :username => 'myuser', :password => 'mypasswd', - :auth_url => 'http://:127.0.0.1:35357', + :auth_url => 'http://:127.0.0.1:5000', :project_name => 'service_project', :user_domain_name => 'domainX', :project_domain_name => 'domainX', diff --git a/spec/classes/ironic_inspector_authtoken_spec.rb b/spec/classes/ironic_inspector_authtoken_spec.rb index d4485c37..dc8da1a7 100644 --- a/spec/classes/ironic_inspector_authtoken_spec.rb +++ b/spec/classes/ironic_inspector_authtoken_spec.rb @@ -13,7 +13,7 @@ describe 'ironic::inspector::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/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/user_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/', :username => 'myuser', :password => 'mypasswd', - :auth_url => 'http://:127.0.0.1:35357', + :auth_url => 'http://:127.0.0.1:5000', :project_name => 'service_project', :user_domain_name => 'domainX', :project_domain_name => 'domainX', diff --git a/spec/unit/provider/ironic_spec.rb b/spec/unit/provider/ironic_spec.rb index 5990aa09..02211f7e 100644 --- a/spec/unit/provider/ironic_spec.rb +++ b/spec/unit/provider/ironic_spec.rb @@ -14,7 +14,7 @@ describe Puppet::Provider::Ironic do 'project_name' => 'admin_tenant', 'username' => 'admin', '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', 'user_domain_name' => 'admin_domain', }