openstack/cookbook-openstack-compute
Code Issues Proposed changes

Use identity_uri_transform for identiry_uri support

Browse Source 
Remove deprecated keys and use identity_uri via the new transform
helper method.

Also, cleanup specs for endpoint testing to make sure Common is
fully tested.

Change-Id: I3beac9d8d80d8a1a15e44bf944f1d8ca84d45350
Implements: blueprint identity-uri
This commit is contained in:
Mark Vanderwiel 2015-03-26 12:27:05 -05:00
parent e8ccaa22b4
commit 1680ba280e
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes/nova-common.rb
View File

@ -130,6 +130,7 @@ end
identity_admin_endpoint = admin_endpoint 'identity-admin' identity_admin_endpoint = admin_endpoint 'identity-admin'
auth_uri = auth_uri_transform identity_endpoint.to_s, node['openstack']['compute']['api']['auth']['version'] auth_uri = auth_uri_transform identity_endpoint.to_s, node['openstack']['compute']['api']['auth']['version']
identity_uri = identity_uri_transform(identity_admin_endpoint)
service_pass = get_password 'service', 'openstack-compute' service_pass = get_password 'service', 'openstack-compute'
template '/etc/nova/nova.conf' do template '/etc/nova/nova.conf' do
@ -170,6 +171,7 @@ template '/etc/nova/nova.conf' do
ec2_api_bind_port: ec2_api_bind.port, ec2_api_bind_port: ec2_api_bind.port,
vmware_host_pass: vmware_host_pass, vmware_host_pass: vmware_host_pass,
auth_uri: auth_uri, auth_uri: auth_uri,
identity_uri: identity_uri,
identity_admin_endpoint: identity_admin_endpoint, identity_admin_endpoint: identity_admin_endpoint,
ironic_endpoint: ironic_endpoint, ironic_endpoint: ironic_endpoint,
ironic_admin_password: ironic_admin_password, ironic_admin_password: ironic_admin_password,

4
spec/nova-common_spec.rb
View File

@ -238,9 +238,7 @@ describe 'openstack-compute::nova-common' do
it 'has correct auth_token settings' do it 'has correct auth_token settings' do
[ [
'auth_uri = http://127.0.0.1:5000/v2.0', 'auth_uri = http://127.0.0.1:5000/v2.0',
'auth_host = 127.0.0.1', 'identity_uri = http://127.0.0.1:35357/',
'auth_port = 35357',
'auth_protocol = http',
'auth_version = v2.0', 'auth_version = v2.0',
'admin_tenant_name = service', 'admin_tenant_name = service',
'admin_user = nova', 'admin_user = nova',

4
templates/default/nova.conf.erb
View File

@ -696,9 +696,7 @@ rbd_secret_uuid=<%= node['openstack']['compute']['libvirt']['rbd']['cinder']['se
[keystone_authtoken] [keystone_authtoken]
auth_uri = <%= @auth_uri %> auth_uri = <%= @auth_uri %>
auth_host = <%= @identity_admin_endpoint.host %> identity_uri = <%= @identity_uri %>
auth_port = <%= @identity_admin_endpoint.port %>
auth_protocol = <%= @identity_admin_endpoint.scheme %>
auth_version = <%= node["openstack"]["compute"]["api"]["auth"]["version"] %> auth_version = <%= node["openstack"]["compute"]["api"]["auth"]["version"] %>
admin_tenant_name = <%= node["openstack"]["compute"]["service_tenant_name"] %> admin_tenant_name = <%= node["openstack"]["compute"]["service_tenant_name"] %>
admin_user = <%= node["openstack"]["compute"]["service_user"] %> admin_user = <%= node["openstack"]["compute"]["service_user"] %>