openstack/puppet-glance
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: Ieb132483803085c0e97a3572fc035af3817467af
This commit is contained in:
qiaomin 2018-05-13 00:35:02 +08:00
parent a4325bd80f
commit 774a89ce0c
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -50,13 +50,13 @@ To utilize the glance module's functionality you will need to declare multiple r
```puppet ```puppet
class { 'glance::api::authtoken': class { 'glance::api::authtoken':
password => '12345', 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', auth_uri => 'http://172.17.0.3:5000',
} }
class { 'glance::registry::authtoken': class { 'glance::registry::authtoken':
password => '12345', 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', auth_uri => 'http://172.17.0.3:5000',
} }

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 glance::api::authtoken( class glance::api::authtoken(
$username = 'glance', $username = 'glance',
$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/registry/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 glance::registry::authtoken( class glance::registry::authtoken(
$username = 'glance', $username = 'glance',
$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/glance_api_authtoken_spec.rb
View File

@ -13,7 +13,7 @@ describe 'glance::api::authtoken' do
it 'configure keystone_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/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/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/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/user_domain_name').with_value('Default')
is_expected.to contain_glance_api_config('keystone_authtoken/project_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/', :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/glance_registry_authtoken_spec.rb
View File

@ -13,7 +13,7 @@ describe 'glance::registry::authtoken' do
it 'configure keystone_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/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/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/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/user_domain_name').with_value('Default')
is_expected.to contain_glance_registry_config('keystone_authtoken/project_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/', :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/glance_image_spec.rb
View File

@ -10,7 +10,7 @@ describe provider_class do
ENV['OS_USERNAME'] = 'test' ENV['OS_USERNAME'] = 'test'
ENV['OS_PASSWORD'] = 'abc123' ENV['OS_PASSWORD'] = 'abc123'
ENV['OS_PROJECT_NAME'] = 'test' 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 end
describe 'when managing an image' do describe 'when managing an image' do