Merge "Replace port 35357 with 5000"
This commit is contained in:
commit
0568bb858b
|
@ -50,13 +50,13 @@ To utilize the glance module's functionality you will need to declare multiple r
|
|||
```puppet
|
||||
class { 'glance::api::authtoken':
|
||||
password => '12345',
|
||||
auth_url => 'http://172.17.0.3:35357',
|
||||
auth_url => 'http://172.17.0.3:5000',
|
||||
auth_uri => 'http://172.17.0.3:5000',
|
||||
}
|
||||
|
||||
class { 'glance::registry::authtoken':
|
||||
password => '12345',
|
||||
auth_url => 'http://172.17.0.3:35357',
|
||||
auth_url => 'http://172.17.0.3:5000',
|
||||
auth_uri => 'http://172.17.0.3:5000',
|
||||
}
|
||||
|
||||
|
|
|
@ -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 glance::api::authtoken(
|
||||
$username = 'glance',
|
||||
$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',
|
||||
|
|
|
@ -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 glance::registry::authtoken(
|
||||
$username = 'glance',
|
||||
$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',
|
||||
|
|
|
@ -13,7 +13,7 @@ describe 'glance::api::authtoken' do
|
|||
it 'configure keystone_authtoken' do
|
||||
is_expected.to contain_glance_api_config('keystone_authtoken/username').with_value('glance')
|
||||
is_expected.to contain_glance_api_config('keystone_authtoken/password').with_value('glance_api_password')
|
||||
is_expected.to contain_glance_api_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:35357')
|
||||
is_expected.to contain_glance_api_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:5000')
|
||||
is_expected.to contain_glance_api_config('keystone_authtoken/project_name').with_value('services')
|
||||
is_expected.to contain_glance_api_config('keystone_authtoken/user_domain_name').with_value('Default')
|
||||
is_expected.to contain_glance_api_config('keystone_authtoken/project_domain_name').with_value('Default')
|
||||
|
@ -53,7 +53,7 @@ describe 'glance::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',
|
||||
|
|
|
@ -13,7 +13,7 @@ describe 'glance::registry::authtoken' do
|
|||
it 'configure keystone_authtoken' do
|
||||
is_expected.to contain_glance_registry_config('keystone_authtoken/username').with_value('glance')
|
||||
is_expected.to contain_glance_registry_config('keystone_authtoken/password').with_value('glance_registry_password')
|
||||
is_expected.to contain_glance_registry_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:35357')
|
||||
is_expected.to contain_glance_registry_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:5000')
|
||||
is_expected.to contain_glance_registry_config('keystone_authtoken/project_name').with_value('services')
|
||||
is_expected.to contain_glance_registry_config('keystone_authtoken/user_domain_name').with_value('Default')
|
||||
is_expected.to contain_glance_registry_config('keystone_authtoken/project_domain_name').with_value('Default')
|
||||
|
@ -53,7 +53,7 @@ describe 'glance::registry::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',
|
||||
|
|
|
@ -10,7 +10,7 @@ describe provider_class do
|
|||
ENV['OS_USERNAME'] = 'test'
|
||||
ENV['OS_PASSWORD'] = 'abc123'
|
||||
ENV['OS_PROJECT_NAME'] = 'test'
|
||||
ENV['OS_AUTH_URL'] = 'http://127.0.0.1:35357/v2.0'
|
||||
ENV['OS_AUTH_URL'] = 'http://127.0.0.1:5000/v2.0'
|
||||
end
|
||||
|
||||
describe 'when managing an image' do
|
||||
|
|
Loading…
Reference in New Issue