openstack
/
puppet-ceilometer
Code Issues Proposed changes

Merge "Replace port 35357 with 5000"

This commit is contained in:
Zuul 2018-05-28 04:53:15 +00:00 committed by Gerrit Code Review
parent d99517b6b0 5650855f4d
commit 6159763e95
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -63,7 +63,7 @@ class { '::ceilometer::agent::notification': }
class { '::ceilometer::db': } class { '::ceilometer::db': }
class { '::ceilometer::keystone::authtoken': class { '::ceilometer::keystone::authtoken':
password => 'a_big_secret', password => 'a_big_secret',
auth_url => 'http://127.0.0.1:35357/', auth_url => 'http://127.0.0.1:5000/',
} }
``` ```

2
examples/site.pp
View File

@ -36,7 +36,7 @@ node default {
# Set common auth parameters used by all agents (compute/central) # Set common auth parameters used by all agents (compute/central)
class { '::ceilometer::agent::auth': class { '::ceilometer::agent::auth':
auth_url => 'http://localhost:35357/v2.0', auth_url => 'http://localhost:5000/v2.0',
auth_password => 'tralalerotralala' auth_password => 'tralalerotralala'
} }

4
manifests/keystone/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 ceilometer::keystone::authtoken( class ceilometer::keystone::authtoken(
$username = 'ceilometer', $username = 'ceilometer',
$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/ceilometer_keystone_authtoken_spec.rb
View File

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