openstack
/
cookbook-openstack-network
Code Issues Proposed changes

invert the order of endpoint and bind_service attributes 

* endpoint type (admin, internal, public) and service (identitiy, network etc.)
  was switched during refactoring, this patch reverts this unintended switching
* edited bind_service service type from public,internal,admin to 'all'
  for default binding to just one service

Change-Id: I9bf230ba53d23ce11a32acaea2410572eaeb6123
Depends-On: Iec485deaf415e4187a323435cce2b6bbadfc5d42
Depends-On: Ia5bddfc5e2fd77cd6e9e855c680b079f78fc1c3f
This commit is contained in:
Jan Klare 2016-02-12 18:47:13 +01:00 committed by Christoph Albers
parent 2ec770de11
commit 66ed38fb89
3 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
attributes/default.rb
View File

@ -23,18 +23,15 @@
# access and use them
%w(public internal admin).each do |ep_type|
# openstack identity service endpoints (used by users and services)
default['openstack']['endpoints']['network'][ep_type]['host'] = '127.0.0.1'
default['openstack']['endpoints']['network'][ep_type]['scheme'] = 'http'
default['openstack']['endpoints']['network'][ep_type]['path'] = ''
default['openstack']['endpoints'][ep_type]['network']['host'] = '127.0.0.1'
default['openstack']['endpoints'][ep_type]['network']['scheme'] = 'http'
default['openstack']['endpoints'][ep_type]['network']['path'] = ''
default['openstack']['endpoints'][ep_type]['network']['port'] = 9696
# web-service (e.g. apache) listen address (can be different from openstack
# network endpoints)
default['openstack']['bind_service']['network'][ep_type]['host'] = '127.0.0.1'
end
%w(endpoints bind_service).each do |type|
default['openstack'][type]['network']['public']['port'] = 9696
default['openstack'][type]['network']['internal']['port'] = 9696
default['openstack'][type]['network']['admin']['port'] = 9696
end
default['openstack']['bind_service']['all']['network']['host'] = '127.0.0.1'
default['openstack']['bind_service']['all']['network']['port'] = 9696
# trigger the usage of syslog (will include the proper recipe to create a log
# config)

6
recipes/default.rb
View File

@ -93,7 +93,7 @@ auth_url =
db_user = node['openstack']['db']['network']['username']
db_pass = get_password 'db', 'neutron'
public_bind_service = node['openstack']['bind_service']['network']['public']
bind_service = node['openstack']['bind_service']['all']['network']
# The auth_url in nova section follows auth_plugin
nova_auth_url = nil
@ -110,8 +110,8 @@ node.default['openstack']['network']['conf'].tap do |conf|
if node['openstack']['network']['syslog']['use']
conf['DEFAULT']['log_config'] = '/etc/openstack/logging.conf'
end
conf['DEFAULT']['bind_host'] = public_bind_service.host
conf['DEFAULT']['bind_port'] = public_bind_service.port
conf['DEFAULT']['bind_host'] = bind_service.host
conf['DEFAULT']['bind_port'] = bind_service.port
conf['nova']['auth_url'] = nova_auth_url
conf['keystone_authtoken']['auth_url'] = auth_url
end

24
spec/identity_registration_spec.rb
View File

@ -44,10 +44,10 @@ describe 'openstack-network::identity_registration' do
general_url = 'http://general.host:456/general_path'
# Set the general endpoint
node.set['openstack']['endpoints']['network']['internal']['uri'] = general_url
node.set['openstack']['endpoints']['network']['public']['uri'] = general_url
node.set['openstack']['endpoints']['internal']['network']['uri'] = general_url
node.set['openstack']['endpoints']['public']['network']['uri'] = general_url
# Set the admin endpoint override
node.set['openstack']['endpoints']['network']['admin']['uri'] = admin_url
node.set['openstack']['endpoints']['admin']['network']['uri'] = admin_url
expect(chef_run).to create_endpoint_openstack_identity_register(
'Register Network Endpoint'
).with(
@ -66,10 +66,10 @@ describe 'openstack-network::identity_registration' do
general_url = 'http://general.host:456/general_path'
# Set the general endpoint
node.set['openstack']['endpoints']['network']['internal']['uri'] = general_url
node.set['openstack']['endpoints']['internal']['network']['uri'] = general_url
# Set the public endpoint override
node.set['openstack']['endpoints']['network']['public']['uri'] = public_url
node.set['openstack']['endpoints']['network']['admin']['uri'] = general_url
node.set['openstack']['endpoints']['public']['network']['uri'] = public_url
node.set['openstack']['endpoints']['admin']['network']['uri'] = general_url
expect(chef_run).to create_endpoint_openstack_identity_register(
'Register Network Endpoint'
).with(
@ -88,10 +88,10 @@ describe 'openstack-network::identity_registration' do
general_url = 'http://general.host:456/general_path'
# Set the general endpoint
node.set['openstack']['endpoints']['network']['admin']['uri'] = general_url
node.set['openstack']['endpoints']['admin']['network']['uri'] = general_url
# Set the internal endpoint override
node.set['openstack']['endpoints']['network']['internal']['uri'] = internal_url
node.set['openstack']['endpoints']['network']['public']['uri'] = general_url
node.set['openstack']['endpoints']['internal']['network']['uri'] = internal_url
node.set['openstack']['endpoints']['public']['network']['uri'] = general_url
expect(chef_run).to create_endpoint_openstack_identity_register(
'Register Network Endpoint'
).with(
@ -110,9 +110,9 @@ describe 'openstack-network::identity_registration' do
internal_url = 'http://internal.host:456/internal_path'
public_url = 'https://public.host:789/public_path'
node.set['openstack']['endpoints']['network']['internal']['uri'] = internal_url
node.set['openstack']['endpoints']['network']['public']['uri'] = public_url
node.set['openstack']['endpoints']['network']['admin']['uri'] = admin_url
node.set['openstack']['endpoints']['internal']['network']['uri'] = internal_url
node.set['openstack']['endpoints']['public']['network']['uri'] = public_url
node.set['openstack']['endpoints']['admin']['network']['uri'] = admin_url
expect(chef_run).to create_endpoint_openstack_identity_register(
'Register Network Endpoint'