openstack
/
puppet-gnocchi
Code Issues Proposed changes

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: Ideba7e85f92803b1ecc059287bf0237c1485fdd5
This commit is contained in:
ZhijunWei 2018-05-13 15:25:09 +08:00
parent ed78de5fdd
commit f0036b7f74
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/site.pp
View File

@ -14,7 +14,7 @@ class { '::gnocchi':
class { '::gnocchi::api':
bind_host => '10.0.0.1',
identity_uri => 'https://identity.openstack.org:35357',
identity_uri => 'https://identity.openstack.org:5000',
keystone_password => 'verysecrete'
}

4
manifests/keystone/authtoken.pp
View File

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

4
spec/classes/gnocchi_keystone_authtoken_spec.rb
View File

@ -13,7 +13,7 @@ describe 'gnocchi::keystone::authtoken' do
it 'configure keystone_authtoken' do
is_expected.to contain_gnocchi_config('keystone_authtoken/username').with_value('gnocchi')
is_expected.to contain_gnocchi_config('keystone_authtoken/password').with_value('gnocchi_password')
is_expected.to contain_gnocchi_config('keystone_authtoken/auth_url').with_value('http://localhost:35357')
is_expected.to contain_gnocchi_config('keystone_authtoken/auth_url').with_value('http://localhost:5000')
is_expected.to contain_gnocchi_config('keystone_authtoken/project_name').with_value('services')
is_expected.to contain_gnocchi_config('keystone_authtoken/user_domain_name').with_value('Default')
is_expected.to contain_gnocchi_config('keystone_authtoken/project_domain_name').with_value('Default')
@ -53,7 +53,7 @@ describe 'gnocchi::keystone::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',