openstack/puppet-openstack-cookiecutter
Code Issues Proposed changes

Merge "Deprecate auth_uri option"

Browse Source
This commit is contained in:
Zuul 2018-04-13 03:21:43 +00:00 committed by Gerrit Code Review
commit c0e3d7ea52
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
puppet-{{cookiecutter.project_name}}/manifests/keystone/authtoken.pp
View File

@ -41,7 +41,7 @@
# (Optional) Authentication type to load
# Defaults to 'password'.
#
# [*auth_uri*]
# [*www_authenticate_uri*]
# (Optional) Complete public Identity API endpoint.
# Defaults to 'http://localhost:5000'.
#
@ -187,7 +187,7 @@ class {{cookiecutter.project_name}}::keystone::authtoken(
$insecure = $::os_service_default,
$auth_section = $::os_service_default,
$auth_type = 'password',
$auth_uri = 'http://localhost:5000',
$www_authenticate_uri = 'http://localhost:5000',
$auth_version = $::os_service_default,
$cache = $::os_service_default,
$cafile = $::os_service_default,
@ -221,7 +221,7 @@ class {{cookiecutter.project_name}}::keystone::authtoken(
password => $password,
project_name => $project_name,
auth_url => $auth_url,
auth_uri => $auth_uri,
www_authenticate_uri => $www_authenticate_uri,
auth_version => $auth_version,
auth_type => $auth_type,
auth_section => $auth_section,

6
puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_keystone_authtoken_spec.rb
View File

@ -20,7 +20,7 @@ describe '{{cookiecutter.project_name}}::keystone::authtoken' do
is_expected.to contain_{{cookiecutter.project_name}}_config('keystone_authtoken/insecure').with_value('<SERVICE DEFAULT>')
is_expected.to contain_{{cookiecutter.project_name}}_config('keystone_authtoken/auth_section').with_value('<SERVICE DEFAULT>')
is_expected.to contain_{{cookiecutter.project_name}}_config('keystone_authtoken/auth_type').with_value('password')
is_expected.to contain_{{cookiecutter.project_name}}_config('keystone_authtoken/auth_uri').with_value('http://localhost:5000')
is_expected.to contain_{{cookiecutter.project_name}}_config('keystone_authtoken/www_authenticate_uri').with_value('http://localhost:5000')
is_expected.to contain_{{cookiecutter.project_name}}_config('keystone_authtoken/auth_version').with_value('<SERVICE DEFAULT>')
is_expected.to contain_{{cookiecutter.project_name}}_config('keystone_authtoken/cache').with_value('<SERVICE DEFAULT>')
is_expected.to contain_{{cookiecutter.project_name}}_config('keystone_authtoken/cafile').with_value('<SERVICE DEFAULT>')
@ -50,7 +50,7 @@ describe '{{cookiecutter.project_name}}::keystone::authtoken' do
context 'when overriding parameters' do
before do
params.merge!({
:auth_uri => 'https://10.0.0.1:9999/',
:www_authenticate_uri => 'https://10.0.0.1:9999/',
:username => 'myuser',
:password => 'mypasswd',
:auth_url => 'https://127.0.0.1:35357',
@ -88,7 +88,7 @@ describe '{{cookiecutter.project_name}}::keystone::authtoken' do
end
it 'configure keystone_authtoken' do
is_expected.to contain_{{cookiecutter.project_name}}_config('keystone_authtoken/auth_uri').with_value('https://10.0.0.1:9999/')
is_expected.to contain_{{cookiecutter.project_name}}_config('keystone_authtoken/www_authenticate_uri').with_value('https://10.0.0.1:9999/')
is_expected.to contain_{{cookiecutter.project_name}}_config('keystone_authtoken/username').with_value(params[:username])
is_expected.to contain_{{cookiecutter.project_name}}_config('keystone_authtoken/password').with_value(params[:password]).with_secret(true)
is_expected.to contain_{{cookiecutter.project_name}}_config('keystone_authtoken/auth_url').with_value(params[:auth_url])