Now using the new bind_address method from common

* cleaned up endpoint and bind interface attributes
* moved compute-ec2 attribute to compute-ec2-api
  for clearness on which is public internal or admin

Change-Id: I16fb99ea2f865ea95b653c68fd5a42f15d039439
This commit is contained in:
Christoph Albers 2016-02-18 14:23:21 +01:00
parent 5ce7ba9ca0
commit 9b46ac6d13
4 changed files with 22 additions and 16 deletions

View File

@ -242,7 +242,7 @@ default['openstack']['compute']['docker']['group'] = 'docker'
# The OpenStack Compute (Nova) XVPvnc endpoint
%w(
compute-xvpvnc compute-novnc
compute-ec2 compute-metadata-api
compute-metadata-api
compute-vnc compute-api
compute-ec2-api
).each do |service|
@ -261,12 +261,11 @@ end
# 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'][type]['compute-ec2-api']['port'] = '8773'
default['openstack']['endpoints'][type]['compute-ec2-api']['path'] = '/services/Cloud'
default['openstack']['endpoints']['admin']['compute-ec2-api']['path'] = '/services/Admin'
default['openstack']['endpoints']['public']['compute-ec2-api']['path'] = '/services/Cloud'
default['openstack']['endpoints']['internal']['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
@ -282,7 +281,6 @@ 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'

View File

@ -38,7 +38,7 @@ internal_nova_api_endpoint = internal_endpoint 'compute-api'
# TBD, another clean up opportunity. We could use the 'admin', and
# 'internal' endpoints for a single service name. For now, we'll
# leave the old names in place.
ec2_admin_endpoint = admin_endpoint 'compute-ec2'
ec2_admin_endpoint = admin_endpoint 'compute-ec2-api'
ec2_public_endpoint = public_endpoint 'compute-ec2-api'
ec2_internal_endpoint = internal_endpoint 'compute-ec2-api'
region = node['openstack']['region']

View File

@ -104,16 +104,24 @@ memcache_servers = memcached_servers.join ','
identity_endpoint = public_endpoint 'identity'
xvpvnc_endpoint = public_endpoint 'compute-xvpvnc'
xvpvnc_bind = node['openstack']['bind_service']['all']['compute-xvpvnc']
xvpvnc_bind_address = bind_address xvpvnc_bind
novnc_endpoint = public_endpoint 'compute-novnc'
novnc_bind = node['openstack']['bind_service']['all']['compute-novnc']
novnc_bind_address = bind_address novnc_bind
vnc_bind = node['openstack']['bind_service']['all']['compute-vnc']
vnc_bind_address = bind_address vnc_bind
vnc_proxy_bind = node['openstack']['bind_service']['all']['compute-vnc-proxy']
vnc_proxy_bind_address = bind_address vnc_proxy_bind
compute_api_bind = node['openstack']['bind_service']['all']['compute-api']
compute_api_bind_address = bind_address compute_api_bind
compute_api_endpoint = internal_endpoint 'compute-api'
compute_metadata_api_bind = node['openstack']['bind_service']['all']['compute-metadata-api']
compute_metadata_api_bind_address = bind_address compute_metadata_api_bind
ec2_api_bind = node['openstack']['bind_service']['all']['compute-ec2-api']
ec2_api_bind_address = bind_address ec2_api_bind
ec2_public_endpoint = public_endpoint 'compute-ec2-api'
serial_console_bind = node['openstack']['bind_service']['all']['compute-serial-console']
serial_console_bind_address = bind_address serial_console_bind
serial_proxy_endpoint = public_endpoint 'compute-serial-proxy'
network_endpoint = internal_endpoint 'network'
image_endpoint = internal_endpoint 'image_api'
@ -149,29 +157,29 @@ node.default['openstack']['compute']['conf_secrets']
get_password 'service', 'openstack-compute'
node.default['openstack']['compute']['conf'].tap do |conf|
conf['DEFAULT']['ec2_listen'] = ec2_api_bind.host
conf['DEFAULT']['ec2_listen'] = ec2_api_bind_address
conf['DEFAULT']['ec2_listen_port'] = ec2_api_bind.port
conf['DEFAULT']['keystone_ec2_url'] = "#{identity_endpoint.scheme}://#{identity_endpoint.host}:#{identity_endpoint.port}/v2.0/ec2tokens"
conf['DEFAULT']['iscsi_helper'] = platform_options['iscsi_helper']
# conf['DEFAULT']['scheduler_default_filters'] = node['openstack']['compute']['scheduler']['default_filters'].join(',')
if node['openstack']['compute']['conf']['DEFAULT']['enabled_apis'].include?('osapi_compute')
conf['DEFAULT']['osapi_compute_listen'] = compute_api_bind.host
conf['DEFAULT']['osapi_compute_listen'] = compute_api_bind_address
conf['DEFAULT']['osapi_compute_listen_port'] = compute_api_bind.port
end
# if node['openstack']['mq']['compute']['rabbit']['ha']
# conf['DEFAULT']['rabbit_hosts'] = rabbit_hosts
# end
conf['DEFAULT']['metadata_listen'] = compute_metadata_api_bind.host
conf['DEFAULT']['metadata_listen'] = compute_metadata_api_bind_address
conf['DEFAULT']['metadata_listen_port'] = compute_metadata_api_bind.port
conf['vnc']['novncproxy_base_url'] = novnc_endpoint.to_s
conf['vnc']['xvpvncproxy_base_url'] = xvpvnc_endpoint.to_s
conf['vnc']['xvpvncproxy_host'] = xvpvnc_bind.host
conf['vnc']['xvpvncproxy_host'] = xvpvnc_bind_address
conf['vnc']['xvpvncproxy_port'] = xvpvnc_bind.port
conf['vnc']['novncproxy_host'] = novnc_bind.host
conf['vnc']['novncproxy_host'] = novnc_bind_address
conf['vnc']['novncproxy_port'] = novnc_bind.port
conf['vnc']['vncserver_listen'] = vnc_bind.host
conf['vnc']['vncserver_proxyclient_address'] = vnc_proxy_bind.host
conf['vnc']['vncserver_listen'] = vnc_bind_address
conf['vnc']['vncserver_proxyclient_address'] = vnc_proxy_bind_address
unless memcache_servers.empty?
conf['DEFAULT']['memcached_servers'] = memcache_servers
end
@ -190,7 +198,7 @@ node.default['openstack']['compute']['conf'].tap do |conf|
# [serial_console] section
conf['serial_console']['base_url'] = "#{serial_proxy_endpoint.scheme}://#{serial_proxy_endpoint.host}:#{serial_proxy_endpoint.port}"
conf['serial_console']['proxyclient_address'] = serial_console_bind.host
conf['serial_console']['proxyclient_address'] = serial_console_bind_address
end
# merge all config options and secrets to be used in the nova.conf.erb

View File

@ -129,7 +129,7 @@ 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']['admin']['compute-ec2']['uri'] = admin_url
node.set['openstack']['endpoints']['admin']['compute-ec2-api']['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(