openstack
/
fuel-library
Code Issues Proposed changes

Fix default value for nova auth_version 

Don't set auth_version to false if nova_hash['auth_version']
isn't set. It leads to breakage of nova-api service work.

Change-Id: I096d97dcf33f80cc5e288ac511b55964ea48b638
Closes-bug: #1614625
This commit is contained in:
iberezovskiy 2016-08-18 19:51:37 +03:00
parent 0eb4eac77e
commit ef0d5be240
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp
View File

@ -273,7 +273,7 @@ class openstack_tasks::openstack_controller::openstack_controller {
admin_tenant_name => pick($nova_hash['admin_tenant_name'], $keystone_tenant),
identity_uri => $keystone_identity_uri,
auth_uri => $keystone_auth_uri,
auth_version => pick($nova_hash['auth_version'], false),
auth_version => pick($nova_hash['auth_version'], $::os_service_default),
ratelimits => $nova_rate_limits_string,
neutron_metadata_proxy_shared_secret => $neutron_metadata_proxy_secret,
osapi_compute_workers => $service_workers,

2
tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb
View File

@ -245,7 +245,7 @@ describe manifest do
:admin_tenant_name => Noop.puppet_function('pick', nova_hash['admin_tenant_name'], keystone_tenant),
:identity_uri => keystone_identity_uri,
:auth_uri => keystone_auth_uri,
:auth_version => Noop.puppet_function('pick', nova_hash['auth_version'], false),
:auth_version => Noop.puppet_function('pick', nova_hash['auth_version'], facts[:os_service_default]),
:neutron_metadata_proxy_shared_secret => neutron_metadata_proxy_secret,
:osapi_compute_workers => service_workers,
:metadata_workers => service_workers,