openstack
/
cookbook-openstack-network
Code Issues Proposed changes

Merge "Use identity_uri_transform for identiry_uri support"

This commit is contained in:
Jenkins 2015-04-16 21:53:10 +00:00 committed by Gerrit Code Review
parent c941d486f0 53366aac19
commit 3d677e5190
5 changed files with 21 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
recipes/default.rb
View File

@ -124,6 +124,7 @@ identity_admin_endpoint = admin_endpoint 'identity-admin'
auth_uri = ::URI.decode identity_endpoint.to_s
auth_uri = auth_uri_transform identity_endpoint.to_s, node['openstack']['network']['api']['auth']['version']
identity_uri = identity_uri_transform(identity_admin_endpoint)
db_user = node['openstack']['db']['network']['username']
db_pass = get_password 'db', 'neutron'
@ -191,7 +192,7 @@ template '/etc/neutron/neutron.conf' do
mq_password: mq_password,
core_plugin: core_plugin,
auth_uri: auth_uri,
identity_admin_endpoint: identity_admin_endpoint,
identity_uri: identity_uri,
service_pass: service_pass,
sql_connection: sql_connection,
nova_endpoint: nova_endpoint,

49
spec/default_spec.rb
View File

@ -59,8 +59,6 @@ describe 'openstack-network' do
end
end
include_context 'endpoint-stubs'
it_behaves_like 'core plugin common configurator',
'bigswitch',
PLUGIN_MAP['bigswitch'],
@ -168,12 +166,8 @@ describe 'openstack-network' do
describe 'linuxbridge' do
let(:file) { chef_run.template('/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini') }
include_context 'endpoint-stubs'
before do
node.set['openstack']['network']['core_plugin'] = 'linuxbridge'
allow_any_instance_of(Chef::Recipe).to receive(:endpoint)
.with('network-linuxbridge')
.and_return(double(host: 'linuxbridge_host'))
end
it_behaves_like 'core plugin common configurator',
@ -193,7 +187,7 @@ describe 'openstack-network' do
enable_security_group: 'True'
it 'sets the local_ip' do
expect(chef_run).to render_file(file.name).with_content(/^local_ip = linuxbridge_host$/)
expect(chef_run).to render_file(file.name).with_content(/^local_ip = 127.0.0.1$/)
end
end
@ -288,7 +282,6 @@ describe 'openstack-network' do
node.set['openstack']['network']['core_plugin'] = 'openvswitch'
end
include_context 'endpoint-stubs'
before do
node.set['openstack']['network']['core_plugin'] = 'openvswitch'
end
@ -329,7 +322,7 @@ describe 'openstack-network' do
end
it 'sets the local_ip' do
expect(chef_run).to render_file(file.name).with_content(/^local_ip = openvswitch_host$/)
expect(chef_run).to render_file(file.name).with_content(/^local_ip = 127.0.0.1$/)
end
it 'sets the default firewall_driver attribute' do
@ -419,8 +412,6 @@ describe 'openstack-network' do
end
context 'template contents' do
include_context 'endpoint-stubs'
it_behaves_like 'custom template banner displayer' do
let(:file_name) { file.name }
end
@ -457,9 +448,13 @@ describe 'openstack-network' do
expect(chef_run).to render_config_file(file.name).with_section_content('DEFAULT', /^router_distributed = False$/)
end
%w(host port).each do |attr|
it "sets the bind #{attr} attribute" do
expect(chef_run).to render_file(file.name).with_content(/^bind_#{attr} = network_#{attr}$/)
it 'sets port and host attributes' do
[
/^bind_port = 9696$/,
/^bind_host = 127.0.0.1$/
].each do |line|
expect(chef_run).to render_config_file(file.name)\
.with_section_content('DEFAULT', line)
end
end
@ -634,13 +629,9 @@ describe 'openstack-network' do
end
end
it 'sets the nova_url attribute' do
node.set['openstack']['network']['nova']['url_version'] = 'nova_version_value'
allow_any_instance_of(Chef::Recipe).to receive(:uri_from_hash)
allow_any_instance_of(Chef::Recipe).to receive(:uri_from_hash)
.with('scheme' => 'compute_scheme', 'host' => 'compute_host', 'port' => 'compute_port', 'path' => 'nova_version_value')
.and_return('nova_url_value')
expect(chef_run).to render_file(file.name).with_content(/^nova_url = nova_url_value$/)
it 'sets the nova_url attribute with the right version' do
node.set['openstack']['network']['nova']['url_version'] = '/nova_version_value'
expect(chef_run).to render_file(file.name).with_content(%r(^nova_url = http://127.0.0.1:8774/nova_version_value$))
end
it 'sets the nova_admin_password attribute' do
@ -648,7 +639,7 @@ describe 'openstack-network' do
end
it 'sets the nova_admin_auth_url attribute' do
expect(chef_run).to render_file(file.name).with_content(/^nova_admin_auth_url = identity_uri$/)
expect(chef_run).to render_file(file.name).with_content(%r(^nova_admin_auth_url = http://127.0.0.1:35357/$))
end
it 'has default nova_api_insecure' do
@ -705,19 +696,11 @@ describe 'openstack-network' do
end
it 'sets the auth_uri attribute' do
allow_any_instance_of(Chef::Recipe).to receive(:auth_uri_transform)
.and_return('auth_uri_value')
expect(chef_run).to render_file(file.name).with_content(/^auth_uri = auth_uri_value$/)
expect(chef_run).to render_file(file.name).with_content(%r(^auth_uri = http://127.0.0.1:5000/v2.0$))
end
%w(host port).each do |attr|
it "sets the auth_#{attr} attribute" do
expect(chef_run).to render_file(file.name).with_content(/^auth_#{attr} = identity_#{attr}$/)
end
end
it 'sets the auth_protocol attribute' do
expect(chef_run).to render_file(file.name).with_content(/^auth_protocol = identity_scheme$/)
it 'sets the identity_uri attribute' do
expect(chef_run).to render_file(file.name).with_content(%r(^identity_uri = http://127.0.0.1:35357/$))
end
it 'sets the auth_version attribute if not equal to v2.0' do

4
spec/metadata_agent_spec.rb
View File

@ -48,10 +48,8 @@ describe 'openstack-network::metadata_agent' do
end
context 'endpoint related attributes' do
include_context 'endpoint-stubs'
it 'sets the auth_url attribute' do
expect(chef_run).to render_file(file.name).with_content(/^auth_url = identity_endpoint_value$/)
expect(chef_run).to render_file(file.name).with_content(%r(^auth_url = http://127.0.0.1:5000/v2.0$))
end
end

33
spec/spec_helper.rb
View File

@ -116,39 +116,6 @@ shared_context 'neutron-stubs' do
end
end
shared_context 'endpoint-stubs' do
before do
allow_any_instance_of(Chef::Recipe).to receive(:endpoint)
.with('network-openvswitch')
.and_return(double(host: 'openvswitch_host', port: 'openvswitch_port'))
allow_any_instance_of(Chef::Recipe).to receive(:endpoint)
.with('network-api-bind')
.and_return(double(host: 'network_host', port: 'network_port'))
allow_any_instance_of(Chef::Recipe).to receive(:internal_endpoint)
.with('compute-api')
.and_return(double(
scheme: 'compute_scheme',
host: 'compute_host',
port: 'compute_port'))
allow_any_instance_of(Chef::Recipe).to receive(:internal_endpoint)
.with('compute-metadata-api')
.and_return(double(
scheme: 'compute_metadata_scheme',
host: 'compute_metadata_host',
port: 'compute_metadata_port'))
allow_any_instance_of(Chef::Recipe).to receive(:admin_endpoint)
.with('identity-admin')
.and_return(double(
host: 'identity_host',
port: 'identity_port',
scheme: 'identity_scheme',
to_s: 'identity_uri'))
allow_any_instance_of(Chef::Recipe).to receive(:internal_endpoint)
.with('identity-internal')
.and_return('identity_endpoint_value')
end
end
shared_examples 'custom template banner displayer' do
it 'shows the custom banner' do
node.set['openstack']['network']['custom_template_banner'] = 'custom_template_banner_value'

6
templates/default/neutron.conf.erb
View File

@ -376,7 +376,7 @@ nova_admin_tenant_name = <%= node["openstack"]["network"]["nova"]["admin_tenant_
nova_admin_password = <%= @nova_admin_pass %>
# Authorization URL for connection to nova in admin context.
nova_admin_auth_url = <%= @identity_admin_endpoint.to_s %>
nova_admin_auth_url = <%= @identity_uri %>
# CA file for novaclient to verify server certificates
<% if node['openstack']['network']['nova']['nova_ca_certificates_file'] -%>
@ -509,9 +509,7 @@ report_interval = <%= node["openstack"]["network"]["api"]["agent"]["agent_report
[keystone_authtoken]
auth_uri = <%= @auth_uri %>
auth_host = <%= @identity_admin_endpoint.host %>
auth_port = <%= @identity_admin_endpoint.port %>
auth_protocol = <%= @identity_admin_endpoint.scheme %>
identity_uri = <%= @identity_uri %>
auth_version = <%= node['openstack']['network']['api']['auth']['version'] %>
admin_tenant_name = <%= node["openstack"]["network"]["service_tenant_name"] %>
admin_user = <%= node["openstack"]["network"]["service_user"] %>