openstack
/
cookbook-openstack-common
Code Issues Proposed changes

Add serial console proxy to common endpoints 

This patch will be followed by one for compute to make use of these
new endpoints.

Partial-Bug: #1470025

Change-Id: I9c4061ea196a511f7fb306f3130db75f4ba52ff1
This commit is contained in:
Zhe Jiang 2015-07-03 17:02:28 +08:00
parent 3d37e8c52f
commit 56aa16500c
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
attributes/default.rb
View File

@ -320,6 +320,17 @@ default['openstack']['endpoints']['compute-metadata-api']['port'] = '8775'
default['openstack']['endpoints']['compute-metadata-api']['path'] = nil
default['openstack']['endpoints']['compute-metadata-api']['bind_interface'] = nil
# The OpenStack Compute (Nova) serial console endpoint
default['openstack']['endpoints']['compute-serial-console-bind']['host'] = node['openstack']['endpoints']['bind-host']
default['openstack']['endpoints']['compute-serial-console-bind']['bind_interface'] = node['openstack']['endpoints']['bind_interface']
# The OpenStack Compute (Nova) serial proxy endpoint
default['openstack']['endpoints']['compute-serial-proxy']['host'] = node['openstack']['endpoints']['host']
default['openstack']['endpoints']['compute-serial-proxy']['scheme'] = 'ws'
default['openstack']['endpoints']['compute-serial-proxy']['port'] = '6083'
default['openstack']['endpoints']['compute-serial-proxy']['path'] = '/'
default['openstack']['endpoints']['compute-serial-proxy']['bind_interface'] = nil
# ******************** OpenStack Network Endpoints ****************************
# The OpenStack Network (Neutron) API endpoint.

23
spec/default_spec.rb
View File

@ -51,9 +51,10 @@ describe 'openstack-common::default' do
it 'has correct host for endpoints' do
%w(identity-api identity-internal identity-admin compute-api compute-ec2-api compute-ec2-admin
compute-xvpvnc compute-novnc compute-vnc compute-metadata-api network-api network-linuxbridge
network-openvswitch image-api block-storage-api object-storage-api telemetry-api orchestration-api
orchestration-api-cfn orchestration-api-cloudwatch database-api bare-metal-api).each do |endpoint|
compute-xvpvnc compute-novnc compute-vnc compute-metadata-api compute-serial-proxy network-api
network-linuxbridge network-openvswitch image-api block-storage-api object-storage-api
telemetry-api orchestration-api orchestration-api-cfn orchestration-api-cloudwatch
database-api bare-metal-api).each do |endpoint|
expect(chef_run.node['openstack']['endpoints'][endpoint]['host']).to eq('127.0.0.1')
end
end
@ -62,19 +63,21 @@ describe 'openstack-common::default' do
node.set['openstack']['endpoints']['bind_interface'] = 'eth1'
%w(identity-bind identity-admin-bind compute-api-bind compute-ec2-api-bind compute-ec2-admin-bind
compute-xvpvnc-bind compute-novnc-bind compute-vnc-bind compute-vnc-proxy-bind compute-metadata-api-bind
network-api-bind image-api-bind image-registry-bind block-storage-api-bind object-storage-api-bind
telemetry-api-bind orchestration-api-bind orchestration-api-cfn-bind orchestration-api-cloudwatch-bind
database-api-bind bare-metal-api-bind dashboard-http-bind dashboard-https-bind).each do |endpoint|
compute-serial-console-bind network-api-bind image-api-bind image-registry-bind block-storage-api-bind
object-storage-api-bind telemetry-api-bind orchestration-api-bind orchestration-api-cfn-bind
orchestration-api-cloudwatch-bind database-api-bind bare-metal-api-bind dashboard-http-bind
dashboard-https-bind).each do |endpoint|
expect(chef_run.node['openstack']['endpoints'][endpoint]['bind_interface']).to eq('eth1')
end
end
it 'has correct bind-host for all bind endpoints' do
%w(identity-bind identity-admin-bind compute-api-bind compute-ec2-api-bind compute-ec2-admin-bind
compute-xvpvnc-bind compute-novnc-bind compute-vnc-bind compute-metadata-api-bind network-api-bind
image-api-bind image-registry-bind block-storage-api-bind object-storage-api-bind telemetry-api-bind
orchestration-api-bind orchestration-api-cfn-bind orchestration-api-cloudwatch-bind database-api-bind
bare-metal-api-bind dashboard-http-bind dashboard-https-bind).each do |endpoint|
compute-xvpvnc-bind compute-novnc-bind compute-vnc-bind compute-metadata-api-bind
compute-serial-console-bind network-api-bind image-api-bind image-registry-bind block-storage-api-bind
object-storage-api-bind telemetry-api-bind orchestration-api-bind orchestration-api-cfn-bind
orchestration-api-cloudwatch-bind database-api-bind bare-metal-api-bind dashboard-http-bind
dashboard-https-bind).each do |endpoint|
expect(chef_run.node['openstack']['endpoints'][endpoint]['host']).to eq('127.0.0.1')
end
end