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: Ia1785dc4ed7df88d0457e640fa0a668baccf12d5 Depends-On: I4f97b659361dabd7fac216305d2aad2f1bb98f51 Depends-On: I9bf230ba53d23ce11a32acaea2410572eaeb6123 Depends-On: Iec485deaf415e4187a323435cce2b6bbadfc5d42 Depends-On: Ia5bddfc5e2fd77cd6e9e855c680b079f78fc1c3f
This commit is contained in:
parent
799029519b
commit
5ce7ba9ca0
@ -240,53 +240,49 @@ default['openstack']['compute']['docker']['group'] = 'docker'
|
||||
# ****************** OpenStack Compute Endpoints ******************************
|
||||
|
||||
# The OpenStack Compute (Nova) XVPvnc endpoint
|
||||
%w(compute-xvpvnc-bind compute-xvpvnc compute-novnc-bind compute-novnc
|
||||
compute-ec2-admin-bind compute-ec2 compute-metadata-api compute-vnc-bind
|
||||
compute-vnc compute-vnc-proxy-bind compute-metadata-api-bind
|
||||
compute-api-bind compute-api compute-ec2-api-bind compute-ec2-api
|
||||
compute-serial-console-bind compute-serial-proxy).each do |service|
|
||||
%w(
|
||||
compute-xvpvnc compute-novnc
|
||||
compute-ec2 compute-metadata-api
|
||||
compute-vnc compute-api
|
||||
compute-ec2-api
|
||||
).each do |service|
|
||||
default['openstack']['bind_service']['all'][service]['host'] = '127.0.0.1'
|
||||
%w(public internal admin).each do |type|
|
||||
default['openstack']['endpoints'][service][type]['host'] = '127.0.0.1'
|
||||
default['openstack']['endpoints'][service][type]['port'] = '6081'
|
||||
default['openstack']['endpoints'][service][type]['bind_interface'] = '127.0.0.1'
|
||||
default['openstack']['endpoints'][service][type]['scheme'] = 'http'
|
||||
default['openstack']['endpoints'][service][type]['path'] = '/console'
|
||||
default['openstack']['endpoints'][service][type]['bind_interface'] = nil
|
||||
default['openstack']['endpoints'][type][service]['host'] = '127.0.0.1'
|
||||
default['openstack']['endpoints'][type][service]['scheme'] = 'http'
|
||||
end
|
||||
end
|
||||
%w(public internal admin).each do |type|
|
||||
default['openstack']['endpoints']['compute-api'][type]['port'] = '8774'
|
||||
default['openstack']['endpoints']['compute-api'][type]['path'] = '/v2/%(tenant_id)s'
|
||||
|
||||
# The OpenStack Compute (Nova) novnc endpoint
|
||||
default['openstack']['endpoints']['compute-novnc-bind'][type]['port'] = '6080'
|
||||
default['openstack']['endpoints']['compute-novnc'][type]['port'] = '6080'
|
||||
default['openstack']['endpoints']['compute-novnc'][type]['path'] = '/vnc_auto.html'
|
||||
|
||||
# The OpenStack Compute (Nova) EC2 Admin API endpoint
|
||||
default['openstack']['endpoints']['compute-ec2-admin-bind'][type]['port'] = '8773'
|
||||
default['openstack']['endpoints']['compute-ec2']['admin']['port'] = '8773'
|
||||
default['openstack']['endpoints']['compute-ec2']['admin']['path'] = '/services/Admin'
|
||||
default['openstack']['endpoints']['compute-metadata-api'][type]['port'] = '8775'
|
||||
default['openstack']['endpoints']['compute-metadata-api'][type]['path'] = nil
|
||||
|
||||
default['openstack']['endpoints']['compute-vnc'][type]['scheme'] = nil
|
||||
default['openstack']['endpoints']['compute-vnc'][type]['port'] = nil
|
||||
default['openstack']['endpoints']['compute-vnc'][type]['path'] = nil
|
||||
|
||||
# The OpenStack Compute (Nova) metadata API endpoint
|
||||
default['openstack']['endpoints']['compute-metadata-api-bind'][type]['port'] = '8775'
|
||||
|
||||
default['openstack']['endpoints'][type]['compute-xvpvnc']['port'] = '6081'
|
||||
default['openstack']['endpoints'][type]['compute-xvpvnc']['path'] = '/console'
|
||||
# The OpenStack Compute (Nova) Native API endpoint
|
||||
default['openstack']['endpoints']['compute-api-bind'][type]['port'] = '8774'
|
||||
|
||||
default['openstack']['endpoints'][type]['compute-api']['port'] = '8774'
|
||||
default['openstack']['endpoints'][type]['compute-api']['path'] = '/v2/%(tenant_id)s'
|
||||
# The OpenStack Compute (Nova) novnc endpoint
|
||||
default['openstack']['endpoints'][type]['compute-novnc']['port'] = '6080'
|
||||
default['openstack']['endpoints'][type]['compute-novnc']['path'] = '/vnc_auto.html'
|
||||
# The OpenStack Compute (Nova) EC2 Admin API endpoint
|
||||
default['openstack']['endpoints']['admin']['compute-ec2']['port'] = '8773'
|
||||
default['openstack']['endpoints']['admin']['compute-ec2']['path'] = '/services/Admin'
|
||||
# The OpenStack Compute (Nova) EC2 API endpoint
|
||||
default['openstack']['endpoints']['compute-ec2-api-bind'][type]['port'] = '8773'
|
||||
default['openstack']['endpoints']['compute-ec2-api'][type]['port'] = '8773'
|
||||
default['openstack']['endpoints']['compute-ec2-api'][type]['path'] = '/services/Cloud'
|
||||
|
||||
default['openstack']['endpoints'][type]['compute-ec2-api']['port'] = '8773'
|
||||
default['openstack']['endpoints'][type]['compute-ec2-api']['path'] = '/services/Cloud'
|
||||
# The OpenStack Compute (Nova) metadata API endpoint
|
||||
default['openstack']['endpoints'][type]['compute-metadata-api']['port'] = '8775'
|
||||
# The OpenStack Compute (Nova) serial proxy endpoint
|
||||
default['openstack']['endpoints']['compute-serial-proxy'][type]['scheme'] = 'ws'
|
||||
default['openstack']['endpoints']['compute-serial-proxy'][type]['port'] = '6083'
|
||||
default['openstack']['endpoints']['compute-serial-proxy'][type]['path'] = '/'
|
||||
default['openstack']['endpoints'][type]['compute-serial-proxy']['scheme'] = 'ws'
|
||||
default['openstack']['endpoints'][type]['compute-serial-proxy']['port'] = '6083'
|
||||
default['openstack']['endpoints'][type]['compute-serial-proxy']['path'] = '/'
|
||||
default['openstack']['endpoints'][type]['compute-serial-proxy']['host'] = '127.0.0.1'
|
||||
end
|
||||
default['openstack']['bind_service']['all']['compute-serial-proxy']['host'] = '127.0.0.1'
|
||||
default['openstack']['bind_service']['all']['compute-vnc-proxy']['host'] = '127.0.0.1'
|
||||
default['openstack']['bind_service']['all']['compute-serial-console']['host'] = '127.0.0.1'
|
||||
default['openstack']['bind_service']['all']['compute-xvpvnc']['port'] = '6081'
|
||||
default['openstack']['bind_service']['all']['compute-vnc']['port'] = '6081'
|
||||
default['openstack']['bind_service']['all']['compute-serial-proxy']['port'] = '6081'
|
||||
default['openstack']['bind_service']['all']['compute-novnc']['port'] = '6080'
|
||||
default['openstack']['bind_service']['all']['compute-ec2-admin']['port'] = '8773'
|
||||
default['openstack']['bind_service']['all']['compute-metadata-api']['port'] = '8775'
|
||||
default['openstack']['bind_service']['all']['compute-api']['port'] = '8774'
|
||||
default['openstack']['bind_service']['all']['compute-ec2-api']['port'] = '8773'
|
||||
|
@ -103,17 +103,17 @@ memcache_servers = memcached_servers.join ','
|
||||
# for those.
|
||||
identity_endpoint = public_endpoint 'identity'
|
||||
xvpvnc_endpoint = public_endpoint 'compute-xvpvnc'
|
||||
xvpvnc_bind = public_endpoint 'compute-xvpvnc-bind'
|
||||
xvpvnc_bind = node['openstack']['bind_service']['all']['compute-xvpvnc']
|
||||
novnc_endpoint = public_endpoint 'compute-novnc'
|
||||
novnc_bind = public_endpoint 'compute-novnc-bind'
|
||||
vnc_bind = public_endpoint 'compute-vnc-bind'
|
||||
vnc_proxy_bind = public_endpoint 'compute-vnc-proxy-bind'
|
||||
compute_api_bind = public_endpoint 'compute-api-bind'
|
||||
novnc_bind = node['openstack']['bind_service']['all']['compute-novnc']
|
||||
vnc_bind = node['openstack']['bind_service']['all']['compute-vnc']
|
||||
vnc_proxy_bind = node['openstack']['bind_service']['all']['compute-vnc-proxy']
|
||||
compute_api_bind = node['openstack']['bind_service']['all']['compute-api']
|
||||
compute_api_endpoint = internal_endpoint 'compute-api'
|
||||
compute_metadata_api_bind = public_endpoint 'compute-metadata-api-bind'
|
||||
ec2_api_bind = public_endpoint 'compute-ec2-api-bind'
|
||||
compute_metadata_api_bind = node['openstack']['bind_service']['all']['compute-metadata-api']
|
||||
ec2_api_bind = node['openstack']['bind_service']['all']['compute-ec2-api']
|
||||
ec2_public_endpoint = public_endpoint 'compute-ec2-api'
|
||||
serial_console_bind = public_endpoint 'compute-serial-console-bind'
|
||||
serial_console_bind = node['openstack']['bind_service']['all']['compute-serial-console']
|
||||
serial_proxy_endpoint = public_endpoint 'compute-serial-proxy'
|
||||
network_endpoint = internal_endpoint 'network'
|
||||
image_endpoint = internal_endpoint 'image_api'
|
||||
|
@ -76,9 +76,9 @@ describe 'openstack-compute::identity_registration' do
|
||||
public_url = 'https://public.host:789/public_path'
|
||||
internal_url = 'http://internal.host:456/internal_path'
|
||||
admin_url = 'https://admin.host:123/admin_path'
|
||||
node.set['openstack']['endpoints']['compute-api']['public']['uri'] = public_url
|
||||
node.set['openstack']['endpoints']['compute-api']['internal']['uri'] = internal_url
|
||||
node.set['openstack']['endpoints']['compute-api']['admin']['uri'] = admin_url
|
||||
node.set['openstack']['endpoints']['public']['compute-api']['uri'] = public_url
|
||||
node.set['openstack']['endpoints']['internal']['compute-api']['uri'] = internal_url
|
||||
node.set['openstack']['endpoints']['admin']['compute-api']['uri'] = admin_url
|
||||
|
||||
expect(chef_run).to create_endpoint_openstack_identity_register(
|
||||
'Register Compute Endpoint'
|
||||
@ -129,9 +129,9 @@ describe 'openstack-compute::identity_registration' do
|
||||
public_url = 'https://public.host:789/public_path'
|
||||
internal_url = 'http://internal.host:456/internal_path'
|
||||
|
||||
node.set['openstack']['endpoints']['compute-ec2']['admin']['uri'] = admin_url
|
||||
node.set['openstack']['endpoints']['compute-ec2-api']['internal']['uri'] = internal_url
|
||||
node.set['openstack']['endpoints']['compute-ec2-api']['public']['uri'] = public_url
|
||||
node.set['openstack']['endpoints']['admin']['compute-ec2']['uri'] = admin_url
|
||||
node.set['openstack']['endpoints']['internal']['compute-ec2-api']['uri'] = internal_url
|
||||
node.set['openstack']['endpoints']['public']['compute-ec2-api']['uri'] = public_url
|
||||
expect(chef_run).to create_endpoint_openstack_identity_register(
|
||||
'Register EC2 Endpoint'
|
||||
).with(
|
||||
|
@ -161,8 +161,8 @@ describe 'openstack-compute::nova-common' do
|
||||
end
|
||||
end
|
||||
|
||||
it 'sets service_type and insecure and scheme for neutron' do
|
||||
node.set['openstack']['endpoints']['network']['internal']['scheme'] = 'https'
|
||||
it 'sets scheme for neutron' do
|
||||
node.set['openstack']['endpoints']['internal']['network']['scheme'] = 'https'
|
||||
expect(chef_run).to render_config_file(file.name)\
|
||||
.with_section_content('neutron', %r{^url = https://127.0.0.1:9696$})
|
||||
end
|
||||
@ -195,8 +195,8 @@ describe 'openstack-compute::nova-common' do
|
||||
end
|
||||
|
||||
it 'has override vncserver_* options set' do
|
||||
node.set['openstack']['endpoints']['compute-vnc-bind']['public']['host'] = '1.1.1.1'
|
||||
node.set['openstack']['endpoints']['compute-vnc-proxy-bind']['public']['host'] = '2.2.2.2'
|
||||
node.set['openstack']['bind_service']['all']['compute-vnc']['host'] = '1.1.1.1'
|
||||
node.set['openstack']['bind_service']['all']['compute-vnc-proxy']['host'] = '2.2.2.2'
|
||||
|
||||
[/^vncserver_listen = 1.1.1.1$/,
|
||||
/^vncserver_proxyclient_address = 2.2.2.2$/].each do |line|
|
||||
@ -347,9 +347,9 @@ describe 'openstack-compute::nova-common' do
|
||||
|
||||
it 'sets overide serial console options set' do
|
||||
node.set['openstack']['endpoints']['compute-serial-console-bind']['bind_interface'] = 'lo'
|
||||
node.set['openstack']['endpoints']['compute-serial-proxy']['public']['scheme'] = 'wss'
|
||||
node.set['openstack']['endpoints']['compute-serial-proxy']['public']['host'] = '1.1.1.1'
|
||||
node.set['openstack']['endpoints']['compute-serial-proxy']['public']['port'] = '6082'
|
||||
node.set['openstack']['endpoints']['public']['compute-serial-proxy']['scheme'] = 'wss'
|
||||
node.set['openstack']['endpoints']['public']['compute-serial-proxy']['host'] = '1.1.1.1'
|
||||
node.set['openstack']['endpoints']['public']['compute-serial-proxy']['port'] = '6082'
|
||||
# node.set['openstack']['compute']['serial_console']['enable'] = 'True'
|
||||
# node.set['openstack']['compute']['serial_console']['port_range'] = '11000:15000'
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user