openstack
/
cookbook-openstack-compute
Code Issues Proposed changes

Merge "Rename attributes: vncserver_* -> server_*"

This commit is contained in:
Zuul 2018-10-05 09:04:40 +00:00 committed by Gerrit Code Review
parent b0cc7a69d5 6d78224bdb
commit c987bedd01
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
recipes/nova-common.rb
View File

@ -163,8 +163,8 @@ node.default['openstack']['compute']['conf'].tap do |conf|
conf['vnc']['xvpvncproxy_port'] = xvpvnc_bind['port']
conf['vnc']['novncproxy_host'] = novnc_bind_address
conf['vnc']['novncproxy_port'] = novnc_bind['port']
conf['vnc']['vncserver_listen'] = vnc_bind_address
conf['vnc']['vncserver_proxyclient_address'] = vnc_proxy_bind_address
conf['vnc']['server_listen'] = vnc_bind_address
conf['vnc']['server_proxyclient_address'] = vnc_proxy_bind_address
unless memcache_servers.empty?
# Need to set the backend explicitly, see LP bug #1572062
conf['cache']['backend'] = 'oslo_cache.memcache_pool'

12
spec/nova-common_spec.rb
View File

@ -185,21 +185,21 @@ describe 'openstack-compute::nova-common' do
end
end
it 'has default vncserver_* options set' do
it 'has default server_* options set' do
node.override['openstack']['endpoints']['compute-vnc-bind']['bind_interface'] = 'lo'
[/^vncserver_listen = 127.0.0.1$/,
/^vncserver_proxyclient_address = 127.0.0.1$/].each do |line|
[/^server_listen = 127.0.0.1$/,
/^server_proxyclient_address = 127.0.0.1$/].each do |line|
expect(chef_run).to render_file(file.name).with_content(line)
end
end
it 'has override vncserver_* options set' do
it 'has override server_* options set' do
node.override['openstack']['bind_service']['all']['compute-vnc']['host'] = '1.1.1.1'
node.override['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|
[/^server_listen = 1.1.1.1$/,
/^server_proxyclient_address = 2.2.2.2$/].each do |line|
expect(chef_run).to render_file(file.name).with_content(line)
end
end