openstack
/
cookbook-openstack-compute
Code Issues Proposed changes

Separate endpoints for vncserver_listen and vncserver_proxyclient_address 

* A patch for Common added a new endpoint for vnc proxy
* Use the new vnc proxy endpoint for the nova.conf

Change-Id: I9909e3dd500d9fcc31133b81c93420b629ed4e37
Closes-Bug: #1367807
This commit is contained in:
Mark Vanderwiel 2014-09-10 11:19:25 -05:00
parent 568b90abdd
commit a80dc09214
5 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -12,6 +12,7 @@ This file is used to list changes made in each version of cookbook-openstack-com
* Add support vnc_keymap from attribute ( default: en-us )
* Add vnc attributes for ssl_only, cert and key
* Bump Chef gem to 11.16
* Separate endpoints for vncserver_listen and vncserver_proxyclient_address
## 9.3.1
* Move auth configuration from api-paste.ini to nova.conf

3
README.md
View File

@ -358,6 +358,9 @@ The following attributes are defined in attributes/default.rb of the common cook
* `openstack['endpoints']['compute-vnc-bind']['host']` - The IP address to bind the vnc service to
* `openstack['endpoints']['compute-vnc-bind']['bind_interface']` - The interface name to bind the vnc service to
* `openstack['endpoints']['compute-vnc-proxy-bind']['host']` - The IP address to bind the vnc proxy service to
* `openstack['endpoints']['compute-vnc-proxy-bind']['bind_interface']` - The interface name to bind the vnc proxy service to
If the value of the 'bind_interface' attribute is non-nil, then the service will be bound to the first IP address on that interface. If the value of the 'bind_interface' attribute is nil, then the service will be bound to the IP address specified in the host attribute.
Testing

2
metadata.rb
View File

@ -25,7 +25,7 @@ recipe 'openstack-compute::vncproxy', 'Installs and configures the vncproxy serv
supports os
end
depends 'openstack-common', '~> 10.0'
depends 'openstack-common', '~> 10.2'
depends 'openstack-identity', '~> 10.0'
depends 'openstack-image', '~> 10.0'
depends 'openstack-network', '~> 10.0'

3
recipes/nova-common.rb
View File

@ -96,6 +96,7 @@ xvpvnc_bind = endpoint 'compute-xvpvnc-bind' || {}
novnc_endpoint = endpoint 'compute-novnc' || {}
novnc_bind = endpoint 'compute-novnc-bind' || {}
vnc_bind = endpoint 'compute-vnc-bind' || {}
vnc_proxy_bind = endpoint 'compute-vnc-proxy-bind' || {}
compute_api_bind = endpoint 'compute-api-bind' || {}
compute_api_endpoint = endpoint 'compute-api' || {}
ec2_api_bind = endpoint 'compute-ec2-api-bind' || {}
@ -142,7 +143,7 @@ template '/etc/nova/nova.conf' do
novncproxy_bind_host: novnc_bind.host,
novncproxy_bind_port: novnc_bind.port,
vncserver_listen: vnc_bind.host,
vncserver_proxyclient_address: vnc_bind.host,
vncserver_proxyclient_address: vnc_proxy_bind.host,
memcache_servers: memcache_servers,
mq_service_type: mq_service_type,
mq_password: mq_password,

10
spec/nova-common_spec.rb
View File

@ -371,6 +371,16 @@ describe 'openstack-compute::nova-common' do
end
end
it 'has override vncserver_* options set' do
node.set['openstack']['endpoints']['compute-vnc-bind']['host'] = '1.1.1.1'
node.set['openstack']['endpoints']['compute-vnc-proxy-bind']['host'] = '2.2.2.2'
[/^vncserver_listen=1.1.1.1$/,
/^vncserver_proxyclient_address=2.2.2.2$/].each do |line|
expect(chef_run).to render_file(file.name).with_content(line)
end
end
it 'has default *vncproxy_* options set' do
[/^xvpvncproxy_host=127.0.0.1$/,
/^xvpvncproxy_port=6081$/,