openstack
/
fuel-library
Code Issues Proposed changes

Merge "[sync/mitaka] Explicitly disable creating nova v3 endpoint" into stable/newton

This commit is contained in:
Jenkins 2017-01-18 11:17:27 +00:00 committed by Gerrit Code Review
parent 9a6b8421a7 51384238cf
commit 9808f852e1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/puppet/openstack_tasks/manifests/openstack_controller/keystone.pp
View File

@ -40,6 +40,7 @@ class openstack_tasks::openstack_controller::keystone {
password => $password,
auth_name => $auth_name,
configure_endpoint => $configure_endpoint,
configure_endpoint_v3 => false,
configure_user => $configure_user,
configure_user_role => $configure_user_role,
service_name => $service_name,

9
tests/noop/spec/hosts/openstack-controller/keystone_spec.rb
View File

@ -47,10 +47,11 @@ describe manifest do
it 'class nova::keystone::auth should contain correct *_url' do
should contain_class('nova::keystone::auth').with(
'public_url' => "#{public_base_url}/v2.1",
'internal_url' => "#{internal_base_url}/v2.1",
'admin_url' => "#{admin_base_url}/v2.1",
'tenant' => tenant,
'public_url' => "#{public_base_url}/v2.1",
'internal_url' => "#{internal_base_url}/v2.1",
'admin_url' => "#{admin_base_url}/v2.1",
'tenant' => tenant,
'configure_endpoint_v3' => false,
)
end